aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-03-26 14:17:31 +0100
committerEven Rouault <even.rouault@spatialys.com>2019-03-26 14:17:31 +0100
commit60b71b6187b6190b9ff626c8b0548789aa5c54d7 (patch)
tree2600560ea49f8fee126e3c66e6b11f22c3055a64 /src
parent6c22035b270aa46f03e6252cd552be14d170e501 (diff)
downloadPROJ-60b71b6187b6190b9ff626c8b0548789aa5c54d7.tar.gz
PROJ-60b71b6187b6190b9ff626c8b0548789aa5c54d7.zip
proj/emess: fix null pointer dereference. CID 193533
Diffstat (limited to 'src')
-rw-r--r--src/apps/emess.cpp2
-rw-r--r--src/apps/proj.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/apps/emess.cpp b/src/apps/emess.cpp
index 52f88aa3..53018ba8 100644
--- a/src/apps/emess.cpp
+++ b/src/apps/emess.cpp
@@ -30,7 +30,7 @@ emess(int code, const char *fmt, ...) {
va_start(args, fmt);
/* prefix program name, if given */
- if (fmt != nullptr)
+ if (emess_dat.Prog_name != nullptr)
(void)fprintf(stderr,"%s\n<%s>: ",pj_get_release(),
emess_dat.Prog_name);
/* print file name and line, if given */
diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp
index 40fc5695..88074280 100644
--- a/src/apps/proj.cpp
+++ b/src/apps/proj.cpp
@@ -532,7 +532,7 @@ int main(int argc, char **argv) {
} else {
if ((fid = fopen(*eargv, "rb")) == nullptr) {
- emess(-2, *eargv, "input file");
+ emess(-2, "input file: %s", *eargv);
continue;
}
emess_dat.File_name = *eargv;