osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Call the buffer for the magic number "magic". 

It's not guaranteed to be a C string, so don't call it "str".

Change-Id: I614ccf4f87b9f6f58d9b72596827224006f1de30
Reviewed-on: https://code.wireshark.org/review/14998
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2016-04-18 18:30:09 -07:00
parent 378bdbfb3f
commit 61677f9c3f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wiretap/mplog.c
View File

@ -224,15 +224,15 @@ mplog_seek_read(wtap *wth, gint64 seek_off, struct wtap_pkthdr *pkthdr,
wtap_open_return_val mplog_open(wtap *wth, int *err, gchar **err_info _U_)
{
gboolean ok;
guint8 str[6];
guint8 magic[6];
ok = wtap_read_bytes(wth->fh, str, 6, err, err_info);
ok = wtap_read_bytes(wth->fh, magic, 6, err, err_info);
if (!ok) {
if (*err != WTAP_ERR_SHORT_READ)
return WTAP_OPEN_ERROR;
return WTAP_OPEN_NOT_MINE;
}
if (memcmp(str, "MPCSII", 6) != 0)
if (memcmp(magic, "MPCSII", 6) != 0)
return WTAP_OPEN_NOT_MINE;
wth->file_encap = WTAP_ENCAP_ISO14443;