|
Line
Link Here
|
| 0 |
-- gaim-0.81.orig/src/util.c |
0 |
++ gaim-0.81/src/util.c |
|
Lines 2842-2848
gaim_url_decode(const char *str)
Link Here
|
| 2842 |
|
2842 |
|
| 2843 |
g_return_val_if_fail(str != NULL, NULL); |
2843 |
g_return_val_if_fail(str != NULL, NULL); |
| 2844 |
|
2844 |
|
| 2845 |
for (i = 0; i < strlen(str); i++) { |
2845 |
for (i = 0; i < strlen(str) && j < sizeof(buf)-2; i++) { |
| 2846 |
char hex[3]; |
2846 |
char hex[3]; |
| 2847 |
|
2847 |
|
| 2848 |
if (str[i] != '%') |
2848 |
if (str[i] != '%') |
|
Lines 2879-2887
gaim_url_encode(const char *str)
Link Here
|
| 2879 |
g_return_val_if_fail(str != NULL, NULL); |
2879 |
g_return_val_if_fail(str != NULL, NULL); |
| 2880 |
|
2880 |
|
| 2881 |
for (i = 0; i < strlen(str); i++) { |
2881 |
for (i = 0; i < strlen(str); i++) { |
| 2882 |
if (isalnum(str[i])) |
2882 |
if (isalnum(str[i])) { |
|
|
2883 |
if(j+1 >= sizeof(buf)-1) break; |
| 2883 |
buf[j++] = str[i]; |
2884 |
buf[j++] = str[i]; |
|
|
2885 |
} |
| 2884 |
else { |
2886 |
else { |
|
|
2887 |
if(j+3 >= sizeof(buf)-1) break; |
| 2885 |
sprintf(buf + j, "%%%02x", (unsigned char)str[i]); |
2888 |
sprintf(buf + j, "%%%02x", (unsigned char)str[i]); |
| 2886 |
j += 3; |
2889 |
j += 3; |
| 2887 |
} |
2890 |
} |