Commit Diff

Commit:
866935350dd80117b670391aa72e9cd4277c27dc
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
`d->abstract' can be NULL sometimes
Actions:
Patch | Tree
commit - 0417dd4ca748932ca5346b460dd6ba626a04826c
commit + 866935350dd80117b670391aa72e9cd4277c27dc
blob - b991e4533263af4315924f508b2b6ece37fdc621
blob + 5a61c7a17b8677b414778b2cd1d9b18d0f73b065
--- mkftsidx/wiki.c
+++ mkftsidx/wiki.c
@@ -103,7 +103,7 @@ el_end(void *data, const char *element)
 	struct mydata *d = data;
 	struct db_entry *e;
 	size_t newcap;
-	const char *title;
+	const char *title, *abstract;
 	char *doc, **toks;
 	void *t;
 	int r, next;
@@ -132,6 +132,9 @@ el_end(void *data, const char *element)
 	if (!strncmp(title, "Wikipedia: ", 11))
 		title += 11;
 
+	if ((abstract = d->abstract) == NULL)
+		abstract = "";
+
 	e = &d->entries[d->len++];
 	e->name = xstrdup(d->url);
 	e->descr = xstrdup(title);
@@ -139,7 +142,7 @@ el_end(void *data, const char *element)
 	if (d->len % 1000 == 0)
 		printf("=> %zu\n", d->len);
 
-	r = asprintf(&doc, "%s %s", title, d->abstract);
+	r = asprintf(&doc, "%s %s", title, abstract);
 	if (r == -1)
 		err(1, "asprintf");