42df163 Do not assert on NULL sbuf in sbuf_get but return an empty string, that allows pkg_is_valid to show the missing fields — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Do not assert on NULL sbuf in sbuf_get but return an empty string, that allows pkg_is_valid to show the missing fields

Baptiste Daroussin committed 13 years ago

commit 42df163c41f1bbb3099cced75bec0e0d62bbfd64
parent 72fced6

2 files changed +3 -3

modified libpkg/utils.c

@@ -66,8 +66,9 @@ sbuf_set(struct sbuf **buf, const char *str)

 char *
 sbuf_get(struct sbuf *buf)
 {
 	if (buf == NULL)
 		return ((char *) "");
 	assert(buf != NULL);
 	if (sbuf_done(buf) == 0)
 		sbuf_finish(buf);

modified pkg/convert.c

@@ -230,9 +230,8 @@ convert_from_old(void)

 			pkg_old_load_from_path(p, path);
 			pkg_from_old(p);
 			pkg_get(p, PKG_NAME, &name, PKG_VERSION, &version);
 			printf("Converting %s-%s...", name, version);
 			printf("Converting %s-%s...\n", name, version);
 			pkgdb_register_ports(db, p);
 			printf("done\n");
 		}
 	}