From 2eca28705a27ab37ee902308af2c134c64c95e61 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 17 Dec 2012 23:22:46 +0100 Subject: [PATCH 1/1] duplicate error subsystem and code for interface errors to prevent accessing stale data Signed-off-by: Felix Fietkau --- interface.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/interface.c b/interface.c index 43d1396..fddb861 100644 --- a/interface.c +++ b/interface.c @@ -80,6 +80,7 @@ void interface_add_error(struct interface *iface, const char *subsystem, int i, len = 0; int *datalen = NULL; char *dest; + int subsystem_len = 0, code_len = 0; if (n_data) { len = n_data * sizeof(char *); @@ -90,13 +91,21 @@ void interface_add_error(struct interface *iface, const char *subsystem, } } + if (subsystem) { + subsystem_len = strlen(subsystem) + 1; + len += subsystem_len; + } + + if (code) { + code_len = strlen(code) + 1; + len += code_len; + } + error = calloc(1, sizeof(*error) + sizeof(char *) + len); if (!error) return; list_add_tail(&error->list, &iface->errors); - error->subsystem = subsystem; - error->code = code; dest = (char *) &error->data[n_data + 1]; for (i = 0; i < n_data; i++) { @@ -104,7 +113,20 @@ void interface_add_error(struct interface *iface, const char *subsystem, memcpy(dest, data[i], datalen[i]); dest += datalen[i]; } - error->data[n_data] = NULL; + error->data[n_data++] = NULL; + + dest = (char *) &error->data[n_data]; + if (subsystem) { + error->subsystem = dest; + strcpy(dest, subsystem); + dest += subsystem_len; + } + + if (code) { + error->code = dest; + strcpy(dest, code); + dest += code_len; + } } static void -- 2.11.0