diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:15:53 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:15:53 +0000 |
commit | 41ee6846b4605bf50f1f5b12acffc71a76257e5d (patch) | |
tree | 78044e6ed77e26ebcdb14ac483f29d508d88a92d /epan/dissectors/dcerpc/idl2wrs.c | |
parent | Adding debian version 4.2.5-2. (diff) | |
download | wireshark-41ee6846b4605bf50f1f5b12acffc71a76257e5d.tar.xz wireshark-41ee6846b4605bf50f1f5b12acffc71a76257e5d.zip |
Merging upstream version 4.2.6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/dcerpc/idl2wrs.c')
-rw-r--r-- | epan/dissectors/dcerpc/idl2wrs.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/epan/dissectors/dcerpc/idl2wrs.c b/epan/dissectors/dcerpc/idl2wrs.c index 054a62d1..3d95a4d6 100644 --- a/epan/dissectors/dcerpc/idl2wrs.c +++ b/epan/dissectors/dcerpc/idl2wrs.c @@ -1657,17 +1657,9 @@ static void parsetypedefstruct(int pass) fixed_array_size=0; is_array_of_pointers=0; if(!g_strcmp0(ti->str, "[")){ - char fss[BASE_BUFFER_SIZE]; - /* this might be a fixed array */ ti=ti->next; - if (!ws_strtou32(ti->str, NULL, &fixed_array_size)) { - FPRINTF(stderr, "ERROR: invalid integer: %s\n", ti->str); - Exit(10); - } - snprintf(fss, BASE_BUFFER_SIZE, "%d", fixed_array_size); - if(!g_strcmp0("]", ti->str)){ /* this is just a normal [] array */ fixed_array_size=0; @@ -1676,9 +1668,8 @@ static void parsetypedefstruct(int pass) fixed_array_size=0; is_array_of_pointers=1; ti=ti->next; - } else if(g_strcmp0(fss, ti->str)){ - FPRINTF(stderr, "ERROR: typedefstruct (%s) fixed array size looks different to calculated one %s!=%s\n", struct_name, fss, ti->str); - ti=ti->next; + } else if (!ws_strtou32(ti->str, NULL, &fixed_array_size)) { + FPRINTF(stderr, "ERROR: invalid integer: %s\n", ti->str); Exit(10); } else { ti=ti->next; |