[svn-commits] russell: trunk r245624 - /trunk/main/event.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Feb  8 17:43:00 2010
New Revision: 245624

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=245624
Log:
Fix return value of get_ie_str() and get_ie_str_hash() for non-existent IE.

I found this bug while developing a unit test for event allocation.  Testing
is awesome.

Modified:
    trunk/main/event.c

Modified: trunk/main/event.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/event.c?view=diff&rev=245624&r1=245623&r2=245624
==============================================================================
--- trunk/main/event.c (original)
+++ trunk/main/event.c Mon Feb  8 17:43:00 2010
@@ -945,7 +945,7 @@
 
 	str_payload = (struct ast_event_ie_str_payload *) iterator->ie->ie_payload;
 
-	return str_payload->str;
+	return str_payload ? str_payload->str : NULL;
 }
 
 void *ast_event_iterator_get_ie_raw(struct ast_event_iterator *iterator)
@@ -982,7 +982,7 @@
 
 	str_payload = ast_event_get_ie_raw(event, ie_type);
 
-	return str_payload->hash;
+	return str_payload ? str_payload->hash : 0;
 }
 
 const char *ast_event_get_ie_str(const struct ast_event *event, enum ast_event_ie_type ie_type)
@@ -991,7 +991,7 @@
 
 	str_payload = ast_event_get_ie_raw(event, ie_type);
 
-	return str_payload->str;
+	return str_payload ? str_payload->str : NULL;
 }
 
 const void *ast_event_get_ie_raw(const struct ast_event *event, enum ast_event_ie_type ie_type)