diff options
Diffstat (limited to 'stdlib/fmtmsg.c')
| -rw-r--r-- | stdlib/fmtmsg.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c index b5d7436956..2ab97b7d90 100644 --- a/stdlib/fmtmsg.c +++ b/stdlib/fmtmsg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997,1999,2000-2003,2005 Free Software Foundation, Inc. +/* Copyright (C) 1997,1999,2000,2001,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -316,7 +316,7 @@ internal_addseverity (int severity, const char *string) int result = MM_OK; /* First see if there is already a record for the severity level. */ - for (runp = severity_list, lastp = NULL; runp != NULL; runp = runp->next) + for (runp = severity_list, lastp = NULL; runp != NULL; runp = runp-> next) if (runp->severity == severity) break; else @@ -324,6 +324,9 @@ internal_addseverity (int severity, const char *string) if (runp != NULL) { + /* Release old string. */ + free ((char *) runp->string); + if (string != NULL) /* Change the string. */ runp->string = string; @@ -364,17 +367,34 @@ int addseverity (int severity, const char *string) { int result; + const char *new_string; /* Prevent illegal SEVERITY values. */ if (severity <= MM_INFO) return MM_NOTOK; + if (string == NULL) + /* We want to remove the severity class. */ + new_string = NULL; + else + { + new_string = __strdup (string); + + if (new_string == NULL) + /* Allocation failed or illegal value. */ + return MM_NOTOK; + } + /* Protect the global data. */ __libc_lock_lock (lock); /* Do the real work. */ result = internal_addseverity (severity, string); + if (result != MM_OK) + /* Free the allocated string. */ + free ((char *) new_string); + /* Release the lock. */ __libc_lock_unlock (lock); @@ -391,6 +411,7 @@ libc_freeres_fn (free_mem) { /* This is data we have to release. */ struct severity_info *here = runp; + free ((char *) runp->string); runp = runp->next; free (here); } |