No newlines in VSC fields

Ref #3948
varnishcache · Jul 7, 2023 · 4716368 · 4716368
1 parent b4968da
commit 4716368
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/bin/varnishd/common/common_vsmw.c b/bin/varnishd/common/common_vsmw.c
@@ -151,6 +151,11 @@ vsmw_idx_head(const struct vsmw *vsmw, int fd)
 	assert(write(fd, buf, strlen(buf)) == strlen(buf));
 }
 
+#define ASSERT_SEG_STR(x) do {			\
+		AN(x);				\
+		AZ(strchr(x, '\n'));		\
+	} while (0);
+
 static void
 vsmw_fmt_index(const struct vsmw *vsmw, const struct vsmwseg *seg, char act)
 {
@@ -159,6 +164,9 @@ vsmw_fmt_index(const struct vsmw *vsmw, const struct vsmwseg *seg, char act)
 	CHECK_OBJ_NOTNULL(vsmw, VSMW_MAGIC);
 	CHECK_OBJ_NOTNULL(seg, VSMWSEG_MAGIC);
 	AN(seg->cluster);
+	ASSERT_SEG_STR(seg->category);
+	ASSERT_SEG_STR(seg->id);
+
 	VSB_printf(vsmw->vsb, "%c %s %zu %zu %s %s\n",
 	    act,
 	    seg->cluster->fn,