[6.0] 50b8dd2a5 Tighten up checks

[Dridi Boukelmoune]

commit 50b8dd2a580cd7f6efbe2564ef5c1a1ebb9d0cd9
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Apr 16 22:15:37 2018 +0100

    Tighten up checks

diff --git a/lib/libvarnish/vtim.c b/lib/libvarnish/vtim.c
index 9772ac800..4bef5e711 100644
--- a/lib/libvarnish/vtim.c
+++ b/lib/libvarnish/vtim.c
@@ -243,6 +243,9 @@ VTIM_parse(const char *p)
 	int hour = 0, min = 0, sec = 0;
 	int d, leap;
 
+	if (p == NULL || *p == '\0')
+		FAIL();
+
 	while (*p == ' ')
 		p++;
 
diff --git a/lib/libvmod_std/vmod_std_conversions.c b/lib/libvmod_std/vmod_std_conversions.c
index bb2be44b8..ba10fa513 100644
--- a/lib/libvmod_std/vmod_std_conversions.c
+++ b/lib/libvmod_std/vmod_std_conversions.c
@@ -194,8 +194,6 @@ vmod_time(VRT_CTX, VCL_STRING p, VCL_TIME d)
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 
-	if (p == NULL)
-		return (d);
 	r = VTIM_parse(p);
 	if (r)
 		return (r);
diff --git a/lib/libvmod_std/vmod_std_fileread.c b/lib/libvmod_std/vmod_std_fileread.c
index 201d743f7..1bb003e48 100644
--- a/lib/libvmod_std/vmod_std_fileread.c
+++ b/lib/libvmod_std/vmod_std_fileread.c
@@ -90,6 +90,9 @@ vmod_fileread(VRT_CTX, struct vmod_priv *priv,
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	AN(priv);
 
+	if (file_name == NULL)
+		return (NULL);
+
 	if (priv->priv != NULL) {
 		CAST_OBJ_NOTNULL(frf, priv->priv, CACHED_FILE_MAGIC);
 		if (!strcmp(file_name, frf->file_name))