# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1208309729 -7200
# Node ID e5667160faa8ceec0844e748a2d36c945b3c75c2
# Parent  01ca1a0b2ebea946f48cd97d244b118bdb87ba74
Fix bug in error handling code.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/lib/uniconv/u-conv-to-enc.h b/lib/uniconv/u-conv-to-enc.h
--- 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 @@
 
   utf8_src = U_TO_U8 (src, srclen, tmpbuf, &tmpbufsize);
   if (utf8_src == NULL)
-    return NULL;
+    return -1;
   utf8_srclen = tmpbufsize;
 
   if (offsets != NULL)