From a9fa812d79c215d0fe2ea23ff911256a838eb660 Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Wed, 14 Dec 2022 11:53:22 -0300 Subject: [PATCH] mxml_load_data: do not dereference NULL on mxml_error() Clean up missing guards in mxml_error() calls that have been copy-and-pasted everywhere. Not deduping the copy-paste, as it is code-smell that shows this library would benefit from several cleanups and maybe refactoring. --- mxml-file.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mxml-file.c b/mxml-file.c index 02eca9d..51e817d 100644 --- a/mxml-file.c +++ b/mxml-file.c @@ -1659,7 +1659,7 @@ mxml_load_data( */ mxml_error("<%s> cannot be a second root node after <%s>", - buffer, first->value.element.name); + buffer, first->value.element.name ? first->value.element.name : "null"); goto error; } @@ -1727,7 +1727,7 @@ mxml_load_data( */ mxml_error("<%s> cannot be a second root node after <%s>", - buffer, first->value.element.name); + buffer, first->value.element.name ? first->value.element.name : "null"); goto error; } @@ -1794,7 +1794,7 @@ mxml_load_data( */ mxml_error("<%s> cannot be a second root node after <%s>", - buffer, first->value.element.name); + buffer, first->value.element.name ? first->value.element.name : "null"); goto error; } @@ -1880,7 +1880,7 @@ mxml_load_data( */ mxml_error("<%s> cannot be a second root node after <%s>", - buffer, first->value.element.name); + buffer, first->value.element.name ? first->value.element.name : "null"); goto error; } @@ -1972,7 +1972,7 @@ mxml_load_data( */ mxml_error("<%s> cannot be a second root node after <%s>", - buffer, first->value.element.name); + buffer, first->value.element.name ? first->value.element.name : "null"); goto error; }