From: Karl Berry <karl@freefriends.org>
Date: Sat, 5 Mar 2005 13:56:37 +0000 (+0000)
Subject: glibcsync
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebb6a7661d352c85cd2df10a2dabc756ede24496;p=pspp

glibcsync
---

diff --git a/lib/iconvme.c b/lib/iconvme.c
index 6905b8b310..68d7f1aca4 100644
--- a/lib/iconvme.c
+++ b/lib/iconvme.c
@@ -1,17 +1,17 @@
 /* Recode strings between character sets, using iconv.
    Copyright (C) 2002, 2003, 2004, 2005 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 by the Free Software Foundation; either version 2.1, or (at
-   your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License along
+   You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
@@ -67,12 +67,6 @@ iconv_string (const char *str, const char *from_codeset,
   size_t outbytes_remaining = outbuf_size - 1; /* -1 for NUL */
   size_t err;
   int have_error = 0;
-
-  if (1 < MB_LEN_MAX && SIZE_MAX / MB_LEN_MAX <= inbytes_remaining)
-    {
-      errno = ENOMEM;
-      return NULL;
-    }
 #endif
 
   if (strcmp (to_codeset, from_codeset) == 0)