From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11345 invoked by alias); 15 Mar 2007 22:20:01 -0000 Received: (qmail 11311 invoked by uid 22791); 15 Mar 2007 22:20:01 -0000 X-Spam-Check-By: sourceware.org Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 15 Mar 2007 22:19:56 +0000 Received: from sunsite.mff.cuni.cz (localhost.localdomain [127.0.0.1]) by sunsite.mff.cuni.cz (8.13.8/8.13.8) with ESMTP id l2FMNiDb013130; Thu, 15 Mar 2007 23:23:44 +0100 Received: (from jj@localhost) by sunsite.mff.cuni.cz (8.13.8/8.13.8/Submit) id l2FMNiBI013123; Thu, 15 Mar 2007 23:23:44 +0100 Date: Thu, 15 Mar 2007 22:20:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Robustify localedef Message-ID: <20070315222344.GQ1826@sunsite.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2007-03/txt/msg00025.txt.bz2 Hi! cd /etc/sysconfig localedef hu_HU.iso88592 -i hu_HU -f iso88592 segfaults after printing a bunch of various errors (errors are ok and expected, but the segfault is not). /etc/sysconfig is just a random directory that contains for localedef bogus i18n source: LANG="en_US.UTF-8" SYSFONT="latarcyrheb-sun16" and in addition to this user error there is also invalid charmap name. With this, localedef calls find_translit eventhough there is locale->categories[LC_CTYPE].ctype == NULL (locale->avail has CTYPE_LOCALE bit set only because locfile_read ors it at the end with not_here). When locale->categories[LC_CTYPE].ctype == NULL, we know localedef will warn and set LC_CTYPE category to a default, which certainly has both translit and translit_include set to NULL, so IMHO returning NULL from find_translit in this case right away is the right thing to do. 2007-03-15 Jakub Jelinek * locale/programs/ld-ctype.c (find_translit): Return NULL if ctype is NULL. --- libc/locale/programs/ld-ctype.c.jj 2006-11-16 17:38:02.000000000 +0100 +++ libc/locale/programs/ld-ctype.c 2007-03-15 22:46:37.000000000 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2005, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1995-2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1995. @@ -1866,6 +1866,9 @@ find_translit (struct localedef_t *local assert (locale != NULL); ctype = locale->categories[LC_CTYPE].ctype; + if (ctype == NULL) + return NULL; + if (ctype->translit != NULL) result = find_translit2 (ctype, charmap, wch); Jakub