From: Bruno Haible <bruno@clisp.org>
Date: Wed, 16 Apr 2008 01:35:29 +0000 (+0200)
Subject: Fix bug in error handling code.
X-Git-Tag: v0.1~7545
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=b2a72dabdfa8bd663f0d5e61706b82953390d4fb;p=gnulib.git

Fix bug in error handling code.
---

diff --git a/ChangeLog b/ChangeLog
index c859ea60b..af5da0078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-15  Bruno Haible  <bruno@clisp.org>
 
+	* lib/uniconv/u-conv-to-enc.h (FUNC): Fix return value when U_TO_U8
+	fails.
+
+2008-04-15  Bruno Haible  <bruno@clisp.org>
+
 	* lib/trim.c (trim2): Fix argument of isspace() macro.
 
 2008-04-15  Paolo Bonzini  <bonzini@gnu.org>
diff --git a/lib/uniconv/u-conv-to-enc.h b/lib/uniconv/u-conv-to-enc.h
index fa5835dc9..b69a2b7f5 100644
--- a/lib/uniconv/u-conv-to-enc.h
+++ b/lib/uniconv/u-conv-to-enc.h
@@ -1,5 +1,5 @@
 /* Conversion from UTF-16/UTF-32 to legacy encodings.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -67,7 +67,7 @@ FUNC (const char *tocode,
 
   utf8_src = U_TO_U8 (src, srclen, tmpbuf, &tmpbufsize);
   if (utf8_src == NULL)
-    return NULL;
+    return -1;
   utf8_srclen = tmpbufsize;
 
   if (offsets != NULL)