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

Use the correct type, that is GByteArray instead of GString. The reason why this 'worked' before (on non-64bit platforms that is): 

struct _GString
{
  gchar  *str;
  gsize len;    
  gsize allocated_len;
};

And:

struct _GArray
{
  gchar *data;
  guint len;
};

We only accessed the first two fields of the GString struct.

svn path=/trunk/; revision=29841
This commit is contained in:
Kovarththanan Rajaratnam 2009-09-10 14:37:09 +00:00
parent aaa6d87cf0
commit 48069c2b01
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/ftypes/ftype-bytes.c
View File

@ -93,7 +93,7 @@ bytes_repr_len(fvalue_t *fv, ftrepr_t rtype _U_)
* 3 bytes it can be at most "2097151." (8 bytes we give it 12)
* 4 bytes it can be at most "268435456." (10 bytes we give it 16)
* 5 bytes it can be at most "34359738368." (12 bytes we give it 20)
*
*
* a 5 bytes encoded subid can already overflow the guint32 that holds a sub-id,
* making it a completely different issue!
*/
@ -476,7 +476,7 @@ cmp_contains(fvalue_t *fv_a, fvalue_t *fv_b)
static gboolean
cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b)
{
GString *a = fv_a->value.gstring;
GByteArray *a = fv_a->value.bytes;
pcre_tuple_t *pcre_t = fv_b->value.re;
int options = 0;
int rc;
@ -494,7 +494,7 @@ cmp_matches(fvalue_t *fv_a, fvalue_t *fv_b)
rc = pcre_exec(
pcre_t->re, /* Compiled PCRE */
pcre_t->ex, /* PCRE extra from pcre_study() */
a->str, /* The data to check for the pattern... */
a->data, /* The data to check for the pattern... */
(int)a->len, /* ... and its length */
0, /* Start offset within data */
options, /* PCRE options */

1
epan/ftypes/ftypes.h
View File

@ -156,7 +156,6 @@ typedef struct _fvalue_t {
gchar *string;
guchar *ustring;
GByteArray *bytes;
GString *gstring;
ipv4_addr ipv4;
e_guid_t guid;
nstime_t time;