kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 16:50:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix return value of get_ie_str() and get_ie_str_hash() for non-existent IE.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@245624 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2010-02-08 23:43:00 +00:00
parent 38ed79a076
commit f2282722dd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/event.c
View File

@@ -945,7 +945,7 @@ const char *ast_event_iterator_get_ie_str(struct ast_event_iterator *iterator)
str_payload = (struct ast_event_ie_str_payload *) iterator->ie->ie_payload; 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) void *ast_event_iterator_get_ie_raw(struct ast_event_iterator *iterator)
@@ -982,7 +982,7 @@ uint32_t ast_event_get_ie_str_hash(const struct ast_event *event, enum ast_event
str_payload = ast_event_get_ie_raw(event, ie_type); 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) const char *ast_event_get_ie_str(const struct ast_event *event, enum ast_event_ie_type ie_type)
@@ -991,7 +991,7 @@ const char *ast_event_get_ie_str(const struct ast_event *event, enum ast_event_i
str_payload = ast_event_get_ie_raw(event, ie_type); 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) const void *ast_event_get_ie_raw(const struct ast_event *event, enum ast_event_ie_type ie_type)