diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-03-26 11:22:19 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-03-26 11:22:19 +0000 |
| commit | f23e5ee26d14b7931c65e5df0bf46ff356c6177b (patch) | |
| tree | 7ec5160f8a03894ed0f4be9a1c312ed5bffdc7e5 /libidn | |
| parent | d0b6ac6c5023a223e150c49c422c7ad2bd99456c (diff) | |
| download | glibc-f23e5ee26d14b7931c65e5df0bf46ff356c6177b.tar.gz glibc-f23e5ee26d14b7931c65e5df0bf46ff356c6177b.tar.xz glibc-f23e5ee26d14b7931c65e5df0bf46ff356c6177b.zip | |
Updated to fedora-glibc-20080326T1041 cvs/fedora-glibc-2_7_90-12
Diffstat (limited to 'libidn')
| -rw-r--r-- | libidn/ChangeLog | 5 | ||||
| -rw-r--r-- | libidn/stringprep.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libidn/ChangeLog b/libidn/ChangeLog index 67d5de1e9e..15efe0e88f 100644 --- a/libidn/ChangeLog +++ b/libidn/ChangeLog @@ -1,3 +1,8 @@ +2008-02-10 Jim Meyering <meyering@redhat.com> + + * stringprep.c (stringprep, stringprep_profile): Remove useless + "if" before "free". + 2006-02-27 Roland McGrath <roland@redhat.com> * Makefile: Use $(..) in place of ../. diff --git a/libidn/stringprep.c b/libidn/stringprep.c index 6041e3937a..f5c9fae073 100644 --- a/libidn/stringprep.c +++ b/libidn/stringprep.c @@ -366,8 +366,7 @@ stringprep (char *in, do { - if (ucs4) - free (ucs4); + free (ucs4); ucs4 = stringprep_utf8_to_ucs4 (in, -1, &ucs4len); maxucs4len = ucs4len + adducs4len; uint32_t *newp = realloc (ucs4, maxucs4len * sizeof (uint32_t)); @@ -449,8 +448,7 @@ stringprep_profile (const char *in, do { - if (str) - free (str); + free (str); str = (char *) malloc (len); if (str == NULL) return STRINGPREP_MALLOC_ERROR; |