5575df7 Do not set package field to "" when setting NULL — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Do not set package field to "" when setting NULL

Vsevolod Stakhov committed 13 years ago

commit 5575df70a2e3b8025dd1d271ab5ceacfcf13b09b
parent 4351685

1 file changed +5 -3

modified libpkg/pkg.c

@@ -285,10 +285,12 @@ pkg_vset(struct pkg *pkg, va_list ap)

 			struct sbuf **sbuf;
 			const char *str = va_arg(ap, const char *);
 			sbuf = &pkg->fields[attr];
 			if (str == NULL) {
 				pkg->fields[attr] = NULL;
 				continue;
 			}
 			if (str == NULL)
 				str = "";
 			sbuf = &pkg->fields[attr];
 			if (attr == PKG_MTREE && !STARTS_WITH(str, "#mtree")) {
 				sbuf_set(sbuf, "#mtree\n");