osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

giop: don't use packet scope for allocating a buffer at init time 

Followup on commit 2c2ee172eb
Also when reading in lines from the file don't use packet scope.

Fixes #16984


(cherry picked from commit 40ce72f1a8)
This commit is contained in:
Jaap Keuter 2020-11-05 10:47:10 +00:00 committed by Guy Harris
parent a00ac1eb9c
commit 30ca9a975e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
epan/dissectors/packet-giop.c
View File

@ -1465,7 +1465,7 @@ static guint32 string_to_IOR(gchar *in, guint32 in_len, guint8 **out) {
gint8 tmpval; /* complete value */
guint32 i;
*out = wmem_alloc0_array(wmem_packet_scope(), guint8, in_len); /* allocate buffer */
*out = wmem_alloc0_array(NULL, guint8, in_len); /* allocate buffer */
if (*out == NULL) {
return 0;
@ -1528,7 +1528,7 @@ static void read_IOR_strings_from_file(const gchar *name, int max_iorlen) {
int len;
int ior_val_len; /* length after unstringifying. */
FILE *fp;
guint8 *out; /* ptr to unstringified IOR */
guint8 *out = NULL; /* ptr to unstringified IOR */
tvbuff_t *tvb; /* temp tvbuff for dissectin IORs */
int my_offset = 0;
gboolean stream_is_big_endian;
@ -1571,6 +1571,7 @@ static void read_IOR_strings_from_file(const gchar *name, int max_iorlen) {
fclose(fp); /* be nice */
wmem_free(NULL, buf);
wmem_free(NULL, out);
}