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

Make sure we don't dereference a null pointer. 

Change-Id: I033c60cdc5b78f4db31903277c659661e0dc5123
Reviewed-on: https://code.wireshark.org/review/4561
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-10-08 13:44:46 -07:00
parent ea5587a090
commit c303a2ebf5
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epan/wslua/wslua_file.c
View File

@ -1710,8 +1710,10 @@ wslua_filehandler_open(wtap *wth, int *err, gchar **err_info)
} }
else if (retval == -1) { else if (retval == -1) {
/* open error - we *must* return an error code! */ /* open error - we *must* return an error code! */
if (err) {
*err = WTAP_ERR_CANT_OPEN; *err = WTAP_ERR_CANT_OPEN;
} }
}
else if (retval == 0) { else if (retval == 0) {
/* not our file type */ /* not our file type */
remove_wth_priv(L, wth); remove_wth_priv(L, wth);
@ -1719,7 +1721,9 @@ wslua_filehandler_open(wtap *wth, int *err, gchar **err_info)
else { else {
/* not a valid return type */ /* not a valid return type */
g_warning("FileHandler read_open routine returned %d", retval); g_warning("FileHandler read_open routine returned %d", retval);
if (err) {
*err = WTAP_ERR_INTERNAL; *err = WTAP_ERR_INTERNAL;
}
retval = -1; retval = -1;
} }
@ -1747,7 +1751,9 @@ wslua_filehandler_read(wtap *wth, int *err, gchar **err_info,
INIT_FILEHANDLER_ROUTINE(read,FALSE); INIT_FILEHANDLER_ROUTINE(read,FALSE);
/* Reset errno */ /* Reset errno */
if (err) {
*err = errno = 0; *err = errno = 0;
}
wth->phdr.opt_comment = NULL; wth->phdr.opt_comment = NULL;
@ -1795,7 +1801,9 @@ wslua_filehandler_seek_read(wtap *wth, gint64 seek_off,
INIT_FILEHANDLER_ROUTINE(seek_read,FALSE); INIT_FILEHANDLER_ROUTINE(seek_read,FALSE);
/* Reset errno */ /* Reset errno */
if (err) {
*err = errno = 0; *err = errno = 0;
}
phdr->opt_comment = NULL; phdr->opt_comment = NULL;
fp = push_File(L, wth->random_fh); fp = push_File(L, wth->random_fh);
@ -1962,7 +1970,9 @@ wslua_filehandler_dump_open(wtap_dumper *wdh, int *err)
fc = push_CaptureInfoConst(L,wdh); fc = push_CaptureInfoConst(L,wdh);
/* Reset err */ /* Reset err */
if (err) {
*err = 0; *err = 0;
}
switch ( lua_pcall(L,2,1,1) ) { switch ( lua_pcall(L,2,1,1) ) {
case 0: case 0:
@ -2018,7 +2028,9 @@ wslua_filehandler_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
INIT_FILEHANDLER_ROUTINE(write,FALSE); INIT_FILEHANDLER_ROUTINE(write,FALSE);
/* Reset errno */ /* Reset errno */
if (err) {
*err = errno = 0; *err = errno = 0;
}
fp = push_Wdh(L, wdh); fp = push_Wdh(L, wdh);
fc = push_CaptureInfoConst(L,wdh); fc = push_CaptureInfoConst(L,wdh);
@ -2056,7 +2068,9 @@ wslua_filehandler_dump_close(wtap_dumper *wdh, int *err)
INIT_FILEHANDLER_ROUTINE(write_close,FALSE); INIT_FILEHANDLER_ROUTINE(write_close,FALSE);
/* Reset errno */ /* Reset errno */
if (err) {
*err = errno = 0; *err = errno = 0;
}
fp = push_Wdh(L, wdh); fp = push_Wdh(L, wdh);
fc = push_CaptureInfoConst(L,wdh); fc = push_CaptureInfoConst(L,wdh);

3
wiretap/file_wrappers.c
View File

@ -1364,8 +1364,9 @@ file_error(FILE_T fh, gchar **err_info)
if (fh->err!=0 && err_info) { if (fh->err!=0 && err_info) {
/* g_strdup() returns NULL for NULL argument */ /* g_strdup() returns NULL for NULL argument */
*err_info = g_strdup(fh->err_info); *err_info = g_strdup(fh->err_info);
} else } else if (err_info) {
*err_info = NULL; *err_info = NULL;
}
return fh->err; return fh->err;
} }