Changeset 387:743195485eec in freeDiameter

Timestamp:

Jul 6, 2010, 2:49:33 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Additional fixes for empty octet string AVPs

File:

• libfreeDiameter/messages.c (modified) (5 diffs)

libfreeDiameter/messages.c

@@ -1139 +1139 @@
         
         /* Copy an octetstring if needed. */
-        if ((type == AVP_TYPE_OCTETSTRING) && (value->os.len)) {
-                CHECK_MALLOC(  avp->avp_storage.os.data = malloc(value->os.len)  );
-                avp->avp_mustfreeos = 1;
-                memcpy(avp->avp_storage.os.data, value->os.data, value->os.len);
+        if (type == AVP_TYPE_OCTETSTRING) {
+                if (value->os.len) {
+                        CHECK_MALLOC(  avp->avp_storage.os.data = malloc(value->os.len)  );
+                        avp->avp_mustfreeos = 1;
+                        memcpy(avp->avp_storage.os.data, value->os.data, value->os.len);
+                } else {
+                        avp->avp_storage.os.data = NULL;
+                }
         }
         
@@ -1334 +1338 @@
 
                         case AVP_TYPE_OCTETSTRING:
-                                memcpy(&buffer[*offset], avp->avp_public.avp_value->os.data, avp->avp_public.avp_value->os.len);
+                                if (avp->avp_public.avp_value->os.len)
+                                        memcpy(&buffer[*offset], avp->avp_public.avp_value->os.data, avp->avp_public.avp_value->os.len);
                                 *offset += PAD4(avp->avp_public.avp_value->os.len);
                                 break;
@@ -1621 +1626 @@
                         avp->avp_rawlen = avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags );
                         
-                        CHECK_MALLOC(  avp->avp_rawdata = malloc(avp->avp_rawlen)  );
-                        
-                        memcpy(avp->avp_rawdata, avp->avp_source, avp->avp_rawlen);
+                        if (avp->avp_rawlen) {
+                                CHECK_MALLOC(  avp->avp_rawdata = malloc(avp->avp_rawlen)  );
+                        
+                                memcpy(avp->avp_rawdata, avp->avp_source, avp->avp_rawlen);
+                        }
+                        
                         avp->avp_source = NULL;
                         
@@ -1675 +1683 @@
                 case AVP_TYPE_OCTETSTRING:
                         /* We just have to copy the string into the storage area */
-                        CHECK_PARAMS_DO( avp->avp_public.avp_len > GETAVPHDRSZ( avp->avp_public.avp_flags ),
+                        CHECK_PARAMS_DO( avp->avp_public.avp_len >= GETAVPHDRSZ( avp->avp_public.avp_flags ),
                                 {
                                         if (error_info) {
@@ -1684 +1692 @@
                                 } );
                         avp->avp_storage.os.len = avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags );
-                        CHECK_MALLOC(  avp->avp_storage.os.data = malloc(avp->avp_storage.os.len)  );
-                        avp->avp_mustfreeos = 1;
-                        memcpy(avp->avp_storage.os.data, avp->avp_source, avp->avp_storage.os.len);
+                        if (avp->avp_storage.os.len) {
+                                CHECK_MALLOC(  avp->avp_storage.os.data = malloc(avp->avp_storage.os.len)  );
+                                avp->avp_mustfreeos = 1;
+                                memcpy(avp->avp_storage.os.data, avp->avp_source, avp->avp_storage.os.len);
+                        } else {
+                                avp->avp_storage.os.data = NULL;
+                        }
                         break;