Changeset 6201646

Timestamp:

Dec 28, 2007, 5:21:57 PM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

7b1d048

Parents:

5376a95

Message:

Fixing bug encountered when last field was not null-terminated.

Files:

• message.c (modified) (1 diff)
• util.c (modified) (1 diff)
• zephyr.c (modified) (2 diffs)

message.c

@@ -79 +79 @@
     owl_list_append_element(&(m->attributes), pair);
   }
-  owl_pair_set_value(pair, owl_validate_or_convert(attrvalue, -1));
+  owl_pair_set_value(pair, owl_validate_or_convert(attrvalue));
 }
 

util.c

@@ -801 +801 @@
  * for formatting.
  */
-char * owl_validate_or_convert(char *in, int len)
-{
-  if (g_utf8_validate(in, len , NULL)) {
+char * owl_validate_or_convert(char *in)
+{
+  if (g_utf8_validate(in, -1, NULL)) {
     return owl_strip_format_chars(in);
   }
   else {
-    return g_convert(in, len,
+    return g_convert(in, -1,
                      "UTF-8", "ISO-8859-1",
                      NULL, NULL, NULL);

zephyr.c

@@ -369 +369 @@
       if (count == j) {
         /* just found the end of the field we're looking for */
-        return(owl_validate_or_convert(n->z_message + save, -1));
+        return(owl_validate_or_convert(n->z_message + save));
       } else {
         save = i + 1;
@@ -377 +377 @@
   /* catch the last field, which might not be null terminated */
   if (count == j - 1) {
-    return owl_validate_or_convert(n->z_message + save, n->z_message_len - save);
+    char *tmp, *out;
+    tmp = owl_malloc(n->z_message_len-save+5);
+    memcpy(tmp, n->z_message+save, n->z_message_len-save);
+    tmp[n->z_message_len-save]='\0';
+    out = owl_validate_or_convert(tmp);
+    owl_free(tmp);
+    return out;
   }