summaryrefslogtreecommitdiff
path: root/epan/diam_dict.l
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2007-07-17 21:29:18 +0000
committerGerald Combs <gerald@wireshark.org>2007-07-17 21:29:18 +0000
commit01567eb9f4226ce9a862215b7b11b6d59e7108f4 (patch)
treed509f8a8827d4c29e028ddfa6316caa8832a3222 /epan/diam_dict.l
parentd38d3652d903ef11bbfe7077f4c36e79374117c3 (diff)
downloadwireshark-01567eb9f4226ce9a862215b7b11b6d59e7108f4.tar.gz
If we can't find dictionary.xml, fail instead of trying to read from
stdin (which makes distcheck unhappy). Fixup whitespace. svn path=/trunk/; revision=22338
Diffstat (limited to 'epan/diam_dict.l')
-rw-r--r--epan/diam_dict.l5
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/diam_dict.l b/epan/diam_dict.l
index b176d8b01a..8cc2ef2221 100644
--- a/epan/diam_dict.l
+++ b/epan/diam_dict.l
@@ -583,6 +583,11 @@ ddict_t* ddict_scan(const char* system_directory, const char* filename) {
sys_dir = system_directory;
yyin = ddict_open(sys_dir,filename);
+
+ if (yyin == NULL) {
+ D(("unable to open %s\n", filename));
+ return NULL;
+ }
write_ptr = NULL;
read_ptr = NULL;