summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2015-08-11 22:27:07 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2015-08-11 22:27:07 +0000
commit2db79e28ed2800c77e1969f542e52272ec879008 (patch)
tree499133d8251a498c97ae860a1c3bb49537431921
parented01e8060875d13c7bbdb8e5978a050067cab604 (diff)
Actually leave the invalid ml in the tree after making it type NONE.
-rw-r--r--usr.bin/file/magic-load.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/file/magic-load.c b/usr.bin/file/magic-load.c
index 7dcf9d73cbd..95431965d54 100644
--- a/usr.bin/file/magic-load.c
+++ b/usr.bin/file/magic-load.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magic-load.c,v 1.13 2015/08/11 22:23:51 nicm Exp $ */
+/* $OpenBSD: magic-load.c,v 1.14 2015/08/11 22:27:06 nicm Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -1024,8 +1024,6 @@ magic_load(FILE *f, const char *path, int warnings)
* case it has any children.
*/
ml->type = MAGIC_TYPE_NONE;
- ml = NULL;
- continue;
}
ml->strength = magic_get_strength(ml);