9cdcaae Fix segfault with some @dirrmtry — HardenedBSD-pkg

HardenedBSD Package Manager

Fix segfault with some @dirrmtry

Baptiste Daroussin committed 14 years ago

commit 9cdcaae5e1106a2ecd1a39344f2cb9b84303f044
parent 0f1bc3099f512025778e61568dd23e64c7088109

1 file changed +14 -11

modified libpkg/pkg_ports.c

@@ -18,6 +18,7 @@ ports_parse_plist(struct pkg *pkg, char *plist)

 	int nbel, i;
 	size_t next;
 	size_t len;
 	size_t j;
 	char sha256[SHA256_DIGEST_LENGTH * 2 + 1];
 	char path[MAXPATHLEN + 1];
 	char *last_plist_file = NULL;

@@ -101,24 +102,26 @@ ports_parse_plist(struct pkg *pkg, char *plist)

 					/* workaround to detect the @dirrmtry */
 					if (comment[0] == '#') {
 						while (!isspace(cmd[0]))
 							cmd++;
 						buf = cmd;
 						while (isspace(cmd[0]))
 							cmd++;
 						while (!isspace(buf[0]))
 							buf++;
 						buf = cmd;
 						while (!isspace(buf[0]) && buf[0] != '\0')
 						while (isspace(buf[0]))
 							buf++;
 						buf[0] = '\0';
 						while (cmd[0] == '\"')
 							cmd++;
 						for (j = strlen(buf) - 1; j > 0 && isspace(buf[j]); j--)
 							buf[j] = '\0';
 						while (buf[0] == '"')
 							buf++;
 						while (cmd[strlen(cmd) -1] == '\"')
 							cmd[strlen(cmd) -1] = '\0';
 						for (j = strlen(buf) - 1; j > 0 && buf[j] == '"'; j--)
 							buf[j] = '\0';
 						ret += pkg_adddir(pkg, cmd);
 						ret += pkg_adddir(pkg, buf);
 					}
 				} else {
 					if (sbuf_len(exec_scripts) == 0)