Changeset 752:9e9840ccf059 in freeDiameter for libfdproto/ostr.c

Timestamp:

Sep 24, 2011, 4:45:14 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Attempt to handle more gracefully (invalid) AVPs that contain an empty octetstring

File:

• libfdproto/ostr.c (modified) (2 diffs)

libfdproto/ostr.c

@@ -45 +45 @@
         os0_t r;
         CHECK_MALLOC_DO( r = malloc(l+1), return NULL );
-        memcpy(r, s, l); /* this might be faster than a strcpy or strdup because it can work with 32 or 64b blocks */
+        if (l)
+                memcpy(r, s, l); /* this might be faster than a strcpy or strdup because it can work with 32 or 64b blocks */
         r[l] = '\0';
         return r;
@@ -58 +59 @@
         if (os1sz > os2sz)
                 return 1;
-        return memcmp(os1, os2, os1sz);
+        return os1sz ? memcmp(os1, os2, os1sz) : 0;
 }