From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 3E6551F461 for ; Tue, 25 Jun 2019 13:35:27 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:subject:to:cc:references:from:date :mime-version:in-reply-to:content-type:content-transfer-encoding :message-id; q=dns; s=default; b=cPY9kS06KhURKRP3QLQUagpek/1iDUX XNQqIRhyGwLf6mN7yqrc3ME2SuPvrS+65vSgaij/tqIJGIy3W6+00FIJ06NV0OnN BPQpAlun5s74O2l4AaG/Nx4tCYovcjz0Jw9/V4/s8AfcBou9HZxVI4lywKxPDRGT hiegTCw4IdVg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:subject:to:cc:references:from:date :mime-version:in-reply-to:content-type:content-transfer-encoding :message-id; s=default; bh=3dVySw6GGXDm8eyJJfrxhDOItp0=; b=ZQStj XHONdvdtgjeQe4wvvuxNrCDDNBQXkgKkTLjZKcip1zp29c+iRXB8Ty8qLqKVA9wW xa/onsb0x7s6ByV8MHK9qDt2EI9rtMQ8qadGBm6B3uWohkspTyN1utErSIbVjcuQ MYZcJIBGu0mK69rlUQQW+gMPwLEaEEwO1DheBU= Received: (qmail 61243 invoked by alias); 25 Jun 2019 13:35:24 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 61226 invoked by uid 89); 25 Jun 2019 13:35:24 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mx0a-001b2d01.pphosted.com Subject: Re: [PATCH] Fix build warnings in locale/programs/ld-ctype.c To: Florian Weimer Cc: GNU C Library References: <45faf360-cad3-7c9b-a914-0823d2724b90@linux.ibm.com> <87pnn12401.fsf@oldenburg2.str.redhat.com> From: Stefan Liebler Date: Tue, 25 Jun 2019 15:33:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <87pnn12401.fsf@oldenburg2.str.redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit x-cbid: 19062513-0016-0000-0000-0000028C388F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19062513-0017-0000-0000-000032E9AB52 Message-Id: <9110cd0d-ba40-5204-0ee3-cba1e9375035@linux.ibm.com> On 6/25/19 3:23 PM, Florian Weimer wrote: > * Stefan Liebler: > >> diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c >> index e6105928da..cfc9c43fd5 100644 >> --- a/locale/programs/ld-ctype.c >> +++ b/locale/programs/ld-ctype.c >> @@ -1396,7 +1396,8 @@ charclass_symbolic_ellipsis (struct linereader *ldfile, >> (int) (now->val.str.lenmb - (cp - last_str)), >> from); >> >> - get_character (now, charmap, repertoire, &seq, &wch); >> + if (get_character (now, charmap, repertoire, &seq, &wch)) >> + goto invalid_range; > > Maybe write: > > if (get_character (now, charmap, repertoire, &seq, &wch) != 0) > > to match the other function calls? Okay. That's no problem. If no one opposes, I'll commit the patch tomorrow with "!= 0". Shall I also update the following occurrence in ctype_read? if (ellipsis_token == tok_none) { if (get_character (now, charmap, repertoire, &seq, &wch)) goto err_label; > > Otherwise, looks good. > > Thanks, > Florian >