Merge branch 'obsd-master'

1 files changed, 0 insertions, 4 deletions

diff --git a/environ.c b/environ.c
index 301c4f29..25968f7b 100644
--- a/environ.c
+++ b/environ.c
@@ -185,10 +185,6 @@ environ_update(struct options *oo, struct environ *src, struct environ *dst)
 	a = options_array_first(o);
 	while (a != NULL) {
 		ov = options_array_item_value(a);
-		if (ov == NULL) {
-			a = options_array_next(a);
-			continue;
-		}
 		if ((envent = environ_find(src, ov->string)) == NULL)
 			environ_clear(dst, ov->string);
 		else