diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-02-02 14:20:15 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-02-02 14:20:15 +0000 |
| commit | 8ef31f222ed89b6ddd3e22b702115981b81e1f8e (patch) | |
| tree | 8effccc112784fdee2c803e1d1546f950c02937a /epan/dissectors/packet-wsp.c | |
| parent | 3ff81e933201612bd216e2de3ded6a692560f88a (diff) | |
Hack: disguise '/*' in text strings to prevent checkAPIs & etc seeing 'start of comment' within a text string.
svn path=/trunk/; revision=47446
Diffstat (limited to 'epan/dissectors/packet-wsp.c')
| -rw-r--r-- | epan/dissectors/packet-wsp.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 9f5a54e95b..27253df066 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -793,8 +793,9 @@ static value_string_ext vals_bearer_types_ext = VALUE_STRING_EXT_INIT(vals_beare static const value_string vals_content_types[] = { /* Well-known media types */ - { 0x00, "*/*" }, - { 0x01, "text/*" }, + /* XXX: hack: "..." "..." used to define several strings so that checkAPIs & etc won't see a 'start of comment' */ + { 0x00, "*" "/" "*" }, + { 0x01, "text/" "*" }, { 0x02, "text/html" }, { 0x03, "text/plain" }, { 0x04, "text/x-hdml" }, @@ -804,12 +805,12 @@ static const value_string vals_content_types[] = { { 0x08, "text/vnd.wap.wml" }, { 0x09, "text/vnd.wap.wmlscript" }, { 0x0A, "text/vnd.wap.channel" }, - { 0x0B, "multipart/*" }, + { 0x0B, "multipart/" "*" }, { 0x0C, "multipart/mixed" }, { 0x0D, "multipart/form-data" }, { 0x0E, "multipart/byteranges" }, { 0x0F, "multipart/alternative" }, - { 0x10, "application/*" }, + { 0x10, "application/" "*" }, { 0x11, "application/java-vm" }, { 0x12, "application/x-www-form-urlencoded" }, { 0x13, "application/x-hdmlc" }, @@ -821,7 +822,7 @@ static const value_string vals_content_types[] = { { 0x19, "application/vnd.wap.wtls-user-certificate" }, { 0x1A, "application/x-x509-ca-cert" }, { 0x1B, "application/x-x509-user-cert" }, - { 0x1C, "image/*" }, + { 0x1C, "image/" "*" }, { 0x1D, "image/gif" }, { 0x1E, "image/jpeg" }, { 0x1F, "image/tiff" }, |