summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-10-17 21:37:31 +0000
committerGuy Harris <guy@alum.mit.edu>2012-10-17 21:37:31 +0000
commitfc0924761282a1f52b67514524966e6d52ad5752 (patch)
tree9cbf36cbcf7485c59c280c4d6a43535cfd6043c1
parent017c8de78ea16f6d986b10bbd7e50e36ba6c5819 (diff)
downloadwireshark-fc0924761282a1f52b67514524966e6d52ad5752.tar.gz
Copy over r45621 from trunk:
------------------------------------------------------------------------ r45621 | darkjames | 2012-10-17 14:14:14 -0700 (Wed, 17 Oct 2012) | 2 lines Only cap_len (not pkt_len) bytes of buffer are valid. svn path=/trunk-1.8/; revision=45623
-rw-r--r--file.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/file.c b/file.c
index d8d6f1a4fe..1be40d1616 100644
--- a/file.c
+++ b/file.c
@@ -3172,7 +3172,7 @@ match_ascii_and_unicode(capture_file *cf, frame_data *fdata, void *criterion)
}
result = MR_NOTMATCHED;
- buf_len = fdata->pkt_len;
+ buf_len = fdata->cap_len;
i = 0;
while (i < buf_len) {
c_char = cf->pd[i];
@@ -3218,7 +3218,7 @@ match_ascii(capture_file *cf, frame_data *fdata, void *criterion)
}
result = MR_NOTMATCHED;
- buf_len = fdata->pkt_len;
+ buf_len = fdata->cap_len;
i = 0;
while (i < buf_len) {
c_char = cf->pd[i];
@@ -3263,7 +3263,7 @@ match_unicode(capture_file *cf, frame_data *fdata, void *criterion)
}
result = MR_NOTMATCHED;
- buf_len = fdata->pkt_len;
+ buf_len = fdata->cap_len;
i = 0;
while (i < buf_len) {
c_char = cf->pd[i];
@@ -3307,7 +3307,7 @@ match_binary(capture_file *cf, frame_data *fdata, void *criterion)
}
result = MR_NOTMATCHED;
- buf_len = fdata->pkt_len;
+ buf_len = fdata->cap_len;
i = 0;
while (i < buf_len) {
if (cf->pd[i] == binary_data[c_match]) {