Changeset 1252:5c6e94202c64 in freeDiameter for libfdproto

Timestamp:

Jan 14, 2014, 12:35:42 AM (10 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix dump of Failed-AVP content as a value is set while the model is not

File:

• libfdproto/dictionary.c (modified) (1 diff)

libfdproto/dictionary.c

@@ -1511 +1511 @@
         FD_DUMP_HANDLE_OFFSET();
         
-        /* Check the parameters are correct */
-        CHECK_PARAMS_DO( avp_value && verify_object(model) && (model->type == DICT_AVP), return NULL );
+        /* Handle invalid parameters */
+        if (!avp_value) {
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(avp value not set)"), return NULL);
+                return *buf;
+        }
+
+        if (!model) {
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(model not set)"), return NULL);
+                return *buf;
+        }
+        
+        if (! ( verify_object(model) && (model->type == DICT_AVP) )) {
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(invalid model)"), return NULL);
+                return *buf;
+        }
         
         /* Get the type definition of this AVP */