CID 709173: Make sure a libisc function we do not use is called properly

bk: 4ff2b0e2MmgFPcM2TExUIZmd4VWpUg

diff --git a/ChangeLog b/ChangeLog
index c2486d71fca4d94900e3473fe756db1c6834082f..33a69dc8a5a3789ba7e4a4aedc84115d3bf9147c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* CID 709173: Make sure a libisc function we do not use is called properly.
 (4.2.7p287) 2012/07/03 Released by Harlan Stenn <stenn@ntp.org>
 * Remove 1024 associations-per-server limit from ntpq.
 * Remove blank line between ntpq mreadvar associations.

diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index 3859ad2e67e2c4be5c5392122e6c3f2115e29f31..3b59e86b075555fd3b5db72d8eea61ca0f6d75e1 100644 (file)
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -512,6 +512,8 @@ isc_file_splitpath(isc_mem_t *mctx, char *path, char **dirname, char **basename)
 {
        char *dir, *file, *slash;
 
+       REQUIRE(path != NULL);
+
        slash = strrchr(path, '/');
 
        if (slash == path) {