source: patches/glibc-2.4-iconv_fix-1.patch@ 337af620

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 337af620 was 49174f3, checked in by Jim Gifford <clfs@…>, 18 years ago

r3970@server (orig r1786): jciccone | 2006-06-19 10:15:25 -0700
Added a missing , in the kernel package size.
  • Property mode set to 100644
File size: 2.6 KB

  • iconv/gconv_db.c 

    Submitted By: Joe Ciccone <jciccone@gmail.com>
Date: 2006-06-19
Initial Package Version: 2.4
Upstream Status: In CVS
Origin: https://bugzilla.samba.org/show_bug.cgi?id=3678
Description: Fixes a problem that showed up in samba. It would fail to
             start with the following error.

smbd: gconv_db.c:232: __gconv_release_step: Assertion `step->__end_fct ==
((void *)0)' failed.

diff -Naur glibc-2.4.orig/iconv/gconv_db.c glibc-2.4/iconv/gconv_db.c
    old new  
    11/* Provide access to the collection of available transformation modules.
    2    Copyright (C) 1997-2003, 2004, 2005 Free Software Foundation, Inc.
     2   Copyright (C) 1997-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    33   This file is part of the GNU C Library.
    44   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
    55
    … …  
    227227      step->__shlib_handle = NULL;
    228228#endif
    229229    }
    230   else
     230  else if (step->__shlib_handle == NULL)
    231231    /* Builtin modules should not have end functions.  */
    232232    assert (step->__end_fct == NULL);
    233233}

  • iconvdata/Makefile 

    diff -Naur glibc-2.4.orig/iconvdata/Makefile glibc-2.4/iconvdata/Makefile
    old new  
    6565include ../Makeconfig
    6666
    6767ifeq (yes,$(build-shared))
    68 tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4
     68tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
     69        tst-iconv6
    6970ifeq ($(have-thread-library),yes)
    7071tests += bug-iconv3
    7172endif

  • iconvdata/tst-iconv6.c 

    diff -Naur glibc-2.4.orig/iconvdata/tst-iconv6.c glibc-2.4/iconvdata/tst-iconv6.c
    old new  
     1/* BZ #2569 */
     2
     3#include <iconv.h>
     4#include <stdio.h>
     5
     6static int
     7do_test (void)
     8{
     9  iconv_t cd0 = iconv_open ("ISO-8859-7", "UTF-16LE");
     10  if (cd0 == (iconv_t) -1)
     11    {
     12      puts ("first iconv_open failed");
     13      return 1;
     14    }
     15  iconv_t cd1 = iconv_open ("ISO-8859-7", "UTF-16LE");
     16  if (cd1 == (iconv_t) -1)
     17    {
     18      puts ("second iconv_open failed");
     19      return 1;
     20    }
     21  if (iconv_close (cd0) != 0)
     22    {
     23      puts ("first iconv_close failed");
     24      return 1;
     25    }
     26  if (iconv_close (cd1) != 0)
     27    {
     28      puts ("second iconv_close failed");
     29      return 1;
     30    }
     31  return 0;
     32}
     33
     34#define TEST_FUNCTION do_test ()
     35#include "../test-skeleton.c"
Note: See TracBrowser for help on using the repository browser.