osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

If the length we allocated was 0, don't try and write to the returned pointer. 

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9276

svn path=/trunk/; revision=52655
This commit is contained in:
Evan Huus 2013-10-16 22:52:40 +00:00
parent f6884b5945
commit 5344c7fef2
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/oids.c
View File

@ -946,14 +946,18 @@ guint oid_encoded2subid_sub(const guint8 *oid_bytes, gint oid_len, guint32** sub
*subids_p = subids = (guint32 *)ep_alloc(sizeof(guint32)*n);
subid_overflow = subids+n;
/* If n is 1 then we found no bytes in the OID with first bit cleared,
* so initialize our one byte to zero and return. This *seems* to be
* the right thing to do in this situation, and at the very least it
* avoids uninitialized memory errors that would otherwise occur. */
if ((is_first && n == 1) || (!is_first && n == 0)) {
/* If n is 0 or 1 (depending on how it was initialized) then we found
* no bytes in the OID with first bit cleared, so initialize our one
* byte (if any) to zero and return. This *seems* to be the right thing
* to do in this situation, and at the very least it avoids
* uninitialized memory errors that would otherwise occur. */
if (is_first && n == 1) {
*subids = 0;
return n;
}
else if (!is_first && n == 0) {
return n;
}
for (i=0; i<oid_len; i++){
guint8 byte = oid_bytes[i];