Changeset 923:6a4d08e239bd in freeDiameter

Timestamp:

Feb 14, 2013, 11:58:55 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix UTF8Dump function for the case of truncating UTF8 multibyte sequence,
thanks Thomas for the algorithm.

File:

• libfdproto/dictionary_functions.c (modified) (1 diff)

libfdproto/dictionary_functions.c

@@ -228 +228 @@
                 char * end = strchr(ret, '\0');
                 
-        
+                while (end > ret) {
+                        end--;
+                        char b = *end;
+                        /* after the position pointed by end, we have only \0s */
+                        if ((b & 0x80) == 0) {
+                                break; /* this is a single byte char, no problem */
+                        } else {
+                                /* this byte is start or cont. of multibyte sequence, as we do not know the next byte we need to delete it. */
+                                *end = '\0';
+                                if (b & 0x40)
+                                        break; /* This was a start byte, we can stop the loop */
+                        }
+                }
         }       
         return ret;