From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 3 Jul 2012 08:44:18 +0000 (-0400)
Subject: CID 709173: Make sure a libisc function we do not use is called properly
X-Git-Tag: NTP_4_2_7P288~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d9c12a0da2f9bcb78476624c28613956f9a0b1d;p=thirdparty%2Fntp.git

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

bk: 4ff2b0e2MmgFPcM2TExUIZmd4VWpUg
---

diff --git a/ChangeLog b/ChangeLog
index c2486d71f..33a69dc8a 100644
--- 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 3859ad2e6..3b59e86b0 100644
--- 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) {