Changeset 730:e21d79595045 in freeDiameter

Timestamp:

Feb 24, 2011 5:19:42 PM (2 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Message:

minor improvements

Files:

• libfdcore/cnxctx.c (modified) (1 diff)
• libfdproto/messages.c (modified) (1 diff)
• libfdproto/ostr.c (modified) (1 diff)

libfdcore/cnxctx.c

@@ -108 +108 @@
         CHECK_PARAMS_DO( ep || family, return NULL );
         CHECK_PARAMS_DO( (! family) || (family == AF_INET) || (family == AF_INET6), return NULL );
+        CHECK_PARAMS_DO( (! ep) || (ep->ss.ss_family == AF_INET) || (ep->ss.ss_family == AF_INET6), return NULL );
         CHECK_PARAMS_DO( (! ep) || (!family) || (ep->ss.ss_family == family), return NULL );
 

libfdproto/messages.c

@@ -1218 +1218 @@
         memcpy(&avp->avp_storage, value, sizeof(union avp_value));
         
-        /* Copy an octetstring if needed. */
+        /* Duplicate an octetstring if needed. */
         if (type == AVP_TYPE_OCTETSTRING) {
                 if (value->os.len) {
-                        CHECK_MALLOC(  avp->avp_storage.os.data = malloc(value->os.len)  );
+                        CHECK_MALLOC(  avp->avp_storage.os.data = os0dup(value->os.data, 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;

libfdproto/ostr.c

@@ -41 +41 @@
 #endif /* !defined(DIAMID_IDNA_IGNORE) && !defined(DIAMID_IDNA_REJECT) */
 
-/* Similar to strdup with (must be verified) os0_t */
+/* Similar to strdup with (must have been verified) os0_t */
 os0_t os0dup_int(os0_t s, size_t l) {
         os0_t r;
-        CHECK_MALLOC_DO( r = calloc(l+1, 1), return NULL );
+        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 */
+        r[l] = '\0';
         return r;
 }