Changeset 752:9e9840ccf059 in freeDiameter

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

Location:

libfdproto

Files:

• messages.c (modified) (1 diff)
• ostr.c (modified) (2 diffs)

libfdproto/messages.c

@@ -1771 +1771 @@
                                 } );
                         avp->avp_storage.os.len = avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags );
-                        if (avp->avp_storage.os.len) {
-                                CHECK_MALLOC(  avp->avp_storage.os.data = os0dup(avp->avp_source, avp->avp_storage.os.len)  );
-                                avp->avp_mustfreeos = 1;
-                        } else {
-                                avp->avp_storage.os.data = NULL;
-                        }
+                        CHECK_MALLOC(  avp->avp_storage.os.data = os0dup(avp->avp_source, avp->avp_storage.os.len)  );
+                        avp->avp_mustfreeos = 1;
                         break;
                 

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;
 }