1cca123 Ensure a plist parsing error is properly reported in the exit number — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Ensure a plist parsing error is properly reported in the exit number

Baptiste Daroussin committed 5 years ago

commit 1cca12349b59d1205a2cf482a5067de405a207ec
parent ef6860d

1 file changed +7 -4

modified libpkg/pkg_ports.c

@@ -773,6 +773,7 @@ parse_actions(const ucl_object_t *o, struct plist *p,

 	const char *actname;
 	ucl_object_iter_t it = NULL;
 	int i, j = 0;
 	int rc, r = EPKG_OK;
 	while ((cur = ucl_iterate_object(o, &it, true))) {
 		actname = ucl_object_tostring(cur);

@@ -799,13 +800,15 @@ parse_actions(const ucl_object_t *o, struct plist *p,

 						return (EPKG_FATAL);
 					}
 				}
 				list_actions[i].perform(p, j > 0 ? argv[j - 1] : line, a);
 				r = list_actions[i].perform(p, j > 0 ? argv[j - 1] : line, a);
 				if (r != EPKG_OK && rc == EPKG_OK)
 					rc = r;
 				break;
 			}
 		}
 	}
 	return (EPKG_OK);
 	return (rc);
 }
 static void

@@ -1250,12 +1253,12 @@ plist_parse(struct plist *pplist, FILE *f)

 		if (line[linelen - 1] == '\n')
 			line[linelen - 1] = '\0';
 		ret = plist_parse_line(pplist, line);
 		if (rc == EPKG_OK)
 		if (ret != EPKG_OK && rc == EPKG_OK)
 			rc = ret;
 	}
 	free(line);
 	return (ret);
 	return (rc);
 }
 int