W dniu 10.04.2015 o 22:27, Tim Rühsen pisze: > Hmmm, if the bug in idna_to_ascii_8z() has been fixed (as Hubert says), we > should simply remove the comment (as Hubert suggests). > > Hubert, could you amend the patch ? Preferably with Ángel's variable renaming. Attached.
Regards, Hubert
From e9ab20eaf3d3b734da45a573c1b5603ccba91df1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81ngel=20Gonz=C3=A1lez?= <keis...@gmail.com>
Date: Sat, 11 Apr 2015 18:58:51 +0200
Subject: [PATCH 2/2] Remove memory leak in idn_encode.
* src/iri.c (idn_encode): Free buffer from remote_to_utf8
when needed; give meaningful names to variables;
remove excessive comment.
---
src/iri.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/iri.c b/src/iri.c
index 4b863d2..5278dee 100644
--- a/src/iri.c
+++ b/src/iri.c
@@ -224,28 +224,29 @@ locale_to_utf8 (const char *str)
char *
idn_encode (struct iri *i, char *host)
{
- char *new;
int ret;
+ char *ascii_encoded;
+ char *utf8_encoded = NULL;
/* Encode to UTF-8 if not done */
if (!i->utf8_encode)
{
- if (!remote_to_utf8 (i, host, &new))
+ if (!remote_to_utf8 (i, host, &utf8_encoded))
return NULL; /* Nothing to encode or an error occured */
- host = new;
}
- /* toASCII UTF-8 NULL terminated string */
- ret = idna_to_ascii_8z (host, &new, IDNA_FLAGS);
+ /* Store in ascii_encoded the ASCII UTF-8 NULL terminated string */
+ ret = idna_to_ascii_8z (utf8_encoded ? utf8_encoded : host, &ascii_encoded, IDNA_FLAGS);
+ xfree (utf8_encoded);
+
if (ret != IDNA_SUCCESS)
{
- /* sXXXav : free new when needed ! */
logprintf (LOG_VERBOSE, _("idn_encode failed (%d): %s\n"), ret,
quote (idna_strerror (ret)));
return NULL;
}
- return new;
+ return ascii_encoded;
}
/* Try to decode an "ASCII encoded" host. Return the new domain in the locale
--
2.3.5
signature.asc
Description: OpenPGP digital signature
