Changeset b40e60d

Timestamp:

2010-07-29T08:57:01Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2fe5eb9

Parents:

3963fdd

Message:

Fixing http_encode(): BitlBee now calls setlocale() (for nickname
transliteration to work), which changes the behaviour of isalpha() (turns
out it's not a simple macro). For HTTP-encoding, this sucks, especially
when doing OAuth (which is very picky about the way HTTP encoding is done).
This should fix problems some people were seeing with posting Twitter
messages containing accents.

Files:

• lib/misc.c (modified) (1 diff)
• tests/check.c (modified) (2 diffs)
• tests/check_util.c (modified) (2 diffs)

lib/misc.c

@@ -305 +305 @@
         for( i = j = 0; t[i]; i ++, j ++ )
         {
-                if( !isalnum( t[i] ) && !strchr( "._-~", t[i] ) )
+                /* Warning: isalnum() is locale-aware, so don't use it here! */
+                if( ( t[i] >= 'A' && t[i] <= 'Z' ) ||
+                    ( t[i] >= 'a' && t[i] <= 'z' ) ||
+                    ( t[i] >= '0' && t[i] <= '9' ) ||
+                    strchr( "._-~", t[i] ) )
+                {
+                        s[j] = t[i];
+                }
+                else
                 {
                         sprintf( s + j, "%%%02X", ((unsigned char*)t)[i] );
                         j += 2;
-                }
-                else
-                {
-                        s[j] = t[i];
                 }
         }

tests/check.c

@@ -3 +3 @@
 #include <gmodule.h>
 #include <check.h>
+#include <locale.h>
 #include "bitlbee.h"
 #include "testsuite.h"
@@ -92 +93 @@
 
         log_init();
+        setlocale(LC_CTYPE, "");
 
         if (verbose) {

tests/check_util.c

@@ -161 +161 @@
 END_TEST
 
+START_TEST(test_http_encode)
+        char s[80];
+        
+        strcpy( s, "ee\xc3""\xab""ee!!..." );
+        http_encode( s );
+        fail_unless( strcmp( s, "ee%C3%ABee%21%21..." ) == 0 );
+END_TEST
+
 Suite *util_suite (void)
 {
@@ -174 +182 @@
         tcase_add_test (tc_core, test_set_url_username_pwd);
         tcase_add_test (tc_core, test_word_wrap);
+        tcase_add_test (tc_core, test_http_encode);
         return s;
 }