Changeset 1316:2e868f71832f in freeDiameter for libfdproto

Timestamp:

Dec 10, 2016, 11:12:02 PM (7 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Tentative fix for invalid pointers reported by Thomas.

File:

• libfdproto/dictionary.c (modified) (5 diffs)

libfdproto/dictionary.c

@@ -262 +262 @@
 
 /* Initialize the "data" part of an object */
-static int init_object_data(struct dict_object * dest, void * source, enum dict_object_type type)
+static int init_object_data(struct dict_object * dest, void * source, enum dict_object_type type, int dupos)
 {
         TRACE_ENTRY("%p %p %d", dest, source, type);
@@ -287 +287 @@
                 case DICT_ENUMVAL:
                         DUP_string_len( dest->data.enumval.enum_name, &dest->datastr_len );
+                        if (dupos) {
+                                // we also need to duplicate the octetstring constant value since it is a pointer.
+                                dest->data.enumval.enum_value.os.data = os0dup( 
+                                                ((struct dict_enumval_data *)source)->enum_value.os.data, 
+                                                ((struct dict_enumval_data *)source)->enum_value.os.len
+                                        );
+                        }
                         break;
 
@@ -1605 +1612 @@
 {
         int ret = 0;
+        int dupos = 0;
         struct dict_object * new = NULL;
         struct dict_object * vendor = NULL;
@@ -1655 +1663 @@
                 CHECK_PARAMS_DO( ((struct dict_cmd_data *)data)->cmd_flag_mask & CMD_FLAG_REQUEST, goto error_param   );
         }
+
+        /* For ENUMVAL object, check if the parent type is an OctetString */
+        if (type == DICT_ENUMVAL) {
+                if (parent->data.type.type_base == AVP_TYPE_OCTETSTRING)
+                        dupos = 1;
+        }
         
         /* We have to check that the new values are not equal to the sentinels */
@@ -1669 +1683 @@
         /* Initialize the data of the new object */
         init_object(new, type);
-        init_object_data(new, data, type);
+        init_object_data(new, data, type, dupos);
         new->dico = dict;
         new->parent = parent;