Blame SOURCES/wireshark-1.10.10-CVE-2014-6425.patch
|
 |
955624 |
diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c
|
|
|
955624 |
index 6f60d9f..bcb8e37 100644
|
|
|
955624 |
--- a/epan/dissectors/packet-cups.c
|
|
|
955624 |
+++ b/epan/dissectors/packet-cups.c
|
|
|
dbc6ab |
@@ -280,7 +280,7 @@ get_quoted_string(tvbuff_t *tvb, gint offset, gint *next_offset, guint *len)
|
|
|
955624 |
if (o != -1) {
|
|
|
955624 |
offset++;
|
|
|
955624 |
l = o - offset;
|
|
|
955624 |
- s = tvb_get_ptr(tvb, offset, l);
|
|
|
955624 |
+ s = tvb_get_ephemeral_string_enc(tvb, offset, l, ENC_ASCII);
|
|
|
955624 |
offset = o + 1;
|
|
|
955624 |
}
|
|
|
955624 |
}
|
|
|
dbc6ab |
@@ -301,7 +301,7 @@ get_unquoted_string(tvbuff_t *tvb, gint offset, gint *next_offset, guint *len)
|
|
|
955624 |
o = tvb_pbrk_guint8(tvb, offset, -1, " \t\r\n", NULL);
|
|
|
955624 |
if (o != -1) {
|
|
|
955624 |
l = o - offset;
|
|
|
955624 |
- s = tvb_get_ptr(tvb, offset, l);
|
|
|
955624 |
+ s = tvb_get_ephemeral_string_enc(tvb, offset, l, ENC_ASCII);
|
|
|
955624 |
offset = o;
|
|
|
955624 |
}
|
|
|
955624 |
|