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

In the include processing code, if ddict_open() fails, bail out 

*regardless* of whether errno is non-zero, so we at least report the
failure.

In the standalone test program built if TEST_DIAM_DICT_STANDALONE is
defined, check for ddict_scan() failing.

Part of fix for bug 7824.

svn path=/trunk/; revision=45452
This commit is contained in:
Guy Harris 2012-10-10 19:06:34 +00:00
parent f68020f1e1
commit 2ea9adc0de
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/diam_dict.l
View File

@ -272,10 +272,11 @@ description_attr description=\042
yyin = ddict_open(sys_dir,e->file);
D(("entity: %s filename: %s yyin: %p\n",e->name,e->file,yyin));
if (!yyin) {
if (errno) {
if (errno)
fprintf(stderr, "Could not open file: '%s', error: %s\n", e->file, g_strerror(errno) );
yyterminate();
}
else
fprintf(stderr, "Could not open file: '%s', error unknown (errno == 0)\n", e->file );
yyterminate();
} else {
include_stack[include_stack_ptr++] = YY_CURRENT_BUFFER;
yy_switch_to_buffer(yy_create_buffer( yyin, YY_BUF_SIZE ) );
@ -814,6 +815,10 @@ int main(int argc, char** argv) {
}
d = ddict_scan(dname,fname,1);
if (d == NULL) {
fprintf(stderr, "Can't open dictionary\n");
return 2;
}
ddict_print(stdout, d);