Module Name: src
Committed By: bouyer
Date: Tue Mar 31 21:13:19 UTC 2009
Modified Files:
src/common/lib/libprop [netbsd-4]: prop_object.c
Log Message:
Apply patch (requested by haad in ticket #1296):
common/lib/libprop/prop_object.c: patch
Fix crash where user was able to crash proplib with trying to
internalize bad xml file with non-existing data type e.g. <number>.
To generate a diff of this commit:
cvs rdiff -u -r1.12.4.2 -r1.12.4.3 src/common/lib/libprop/prop_object.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libprop/prop_object.c
diff -u src/common/lib/libprop/prop_object.c:1.12.4.2 src/common/lib/libprop/prop_object.c:1.12.4.3
--- src/common/lib/libprop/prop_object.c:1.12.4.2 Sun Nov 30 23:50:04 2008
+++ src/common/lib/libprop/prop_object.c Tue Mar 31 21:13:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_object.c,v 1.12.4.2 2008/11/30 23:50:04 snj Exp $ */
+/* $NetBSD: prop_object.c,v 1.12.4.3 2009/03/31 21:13:19 bouyer Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -633,7 +633,7 @@
poi->poi_taglen))
break;
}
- if (poi == NULL) {
+ if ((poi == NULL) || (poi->poi_intern == NULL)) {
while (_prop_stack_pop(&stack, &obj, &iter, &data, NULL)) {
iter_func = (prop_object_internalizer_continue_t)iter;
(*iter_func)(&stack, &obj, ctx, data, NULL);
