forked from osmocom/wireshark
*Correctly* append to the filter string.
svn path=/trunk/; revision=12926
This commit is contained in:
parent
4d38774957
commit
ffaf53a9d6
|
@ -792,6 +792,7 @@ static int parse_filter(ASN1_SCK *a, char **filter, guint *filter_length,
|
||||||
guint length;
|
guint length;
|
||||||
gboolean def;
|
gboolean def;
|
||||||
int ret;
|
int ret;
|
||||||
|
static const char extensibleMatch[] = "(extensibleMatch not decoded)";
|
||||||
|
|
||||||
ret = asn1_header_decode(a, &cls, &con, &tag, &def, &length);
|
ret = asn1_header_decode(a, &cls, &con, &tag, &def, &length);
|
||||||
if (ret != ASN1_ERR_NOERROR)
|
if (ret != ASN1_ERR_NOERROR)
|
||||||
|
@ -928,8 +929,9 @@ static int parse_filter(ASN1_SCK *a, char **filter, guint *filter_length,
|
||||||
ret = asn1_null_decode(a, length);
|
ret = asn1_null_decode(a, length);
|
||||||
if (ret != ASN1_ERR_NOERROR)
|
if (ret != ASN1_ERR_NOERROR)
|
||||||
return ret;
|
return ret;
|
||||||
*filter = g_strdup("(extensibleMatch not decoded)");
|
*filter_length += sizeof extensibleMatch - 1;
|
||||||
*filter_length = strlen(*filter);
|
*filter = g_realloc(*filter, *filter_length);
|
||||||
|
strcat(*filter, extensibleMatch);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return ASN1_ERR_WRONG_TYPE;
|
return ASN1_ERR_WRONG_TYPE;
|
||||||
|
|
Loading…
Reference in New Issue