From patchwork Mon Apr 13 12:28:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 460762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 0A18F14018C for ; Mon, 13 Apr 2015 22:29:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=sourceware.org header.i=@sourceware.org header.b=bsRNVdi9; dkim-adsp=none (unprotected policy); dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=P0CBNFXYGHSbhXyHUqVZWdbCDC23Hs+ PbX+aKz5hKMBsLNRh2XDb2BnS5KjR/DGrHhl2T3ISiHr77FzfpkDfMLARmaYbPdA 3MS7w2bw8OFDKDjZmo0QdzsFCBKHA5wSzHvTJodsJNnucw6HLM2RgMNfksogavHb MuBfRLgH36Ig= 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:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=KxxhfFy8bg84Dlcb/V8+u4L2Vdw=; b=bsRNV di9b6Po8+82RX1WcKNMnRWG3ABQc3dvH96sortNN/brgtpbitP568PDif46OtYIS Fb4S7wXagSJ3IhHrNbWYyBMSts78euBY3NkmWyjp1sCbazi9lfQknmR6W3T3HsYN RvGXpmpmfBaX8TbmgOPc9KYAPzRyO1Ij/rHyuU= Received: (qmail 20854 invoked by alias); 13 Apr 2015 12:29:08 -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 Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 20825 invoked by uid 89); 13 Apr 2015 12:29:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-lb0-f169.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6MenzRUSll/cFa5j6BL/PaywT1cbIurudfK+aHL3KWU=; b=jqvzo3Fy9Nr918fV5wO5DJOkkCIOqEzI6+AUc1ufOvJnl6d0BkRTj9P/lC8LrJfABf AxIJ8uBUFsQvoQHol0QoO5KlYfXeSBc6a7EQiKB4gGOCdQR1o8ugJWP7+lprQrW/mBER BV1wO32TaJxEkjFGdv5IiLm3KZUH8zY5rFlvYBprCUHndTOPlreaNcuw9oopPe0DC0Oe vITLy3qRRIKCshZK9NqPyijxzK+Sd5/iunCe5k3e1jhVf/wlKWXz7wYtXXfQ5+mPNXOX 6MQ8G3nmbqsxnQDGzvDlyNyQTTCy6jhh9rnBcpjxoboUnFaasf7+yIoG05jktlIgjM0M bY+A== X-Gm-Message-State: ALoCoQlb64ooCtZhsUKbmORCLN3diHTvhpgUE58+lX84l1RvWO7gOqu1C6k95m5xWLluWpVSoQpN X-Received: by 10.112.90.201 with SMTP id by9mr12817025lbb.30.1428928144027; Mon, 13 Apr 2015 05:29:04 -0700 (PDT) From: Rasmus Villemoes To: libc-alpha@sourceware.org Cc: Jeff King , Rasmus Villemoes Subject: [RFC/PoC 2/4] getdelim: Change cur_len from ssize_t to size_t Date: Mon, 13 Apr 2015 14:28:35 +0200 Message-Id: <1428928117-8643-3-git-send-email-rv@rasmusvillemoes.dk> In-Reply-To: <1428928117-8643-1-git-send-email-rv@rasmusvillemoes.dk> References: <1428928117-8643-1-git-send-email-rv@rasmusvillemoes.dk> In preparation for introducing getdelim_append, change the type of cur_len to size_t. Signed-off-by: Rasmus Villemoes --- libio/iogetdelim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libio/iogetdelim.c b/libio/iogetdelim.c index 6606c4b..eeda0eb 100644 --- a/libio/iogetdelim.c +++ b/libio/iogetdelim.c @@ -44,7 +44,7 @@ _IO_getdelim (lineptr, n, delimiter, fp) _IO_FILE *fp; { _IO_ssize_t result = 0; - _IO_ssize_t cur_len = 0; + _IO_size_t cur_len = 0; _IO_ssize_t len; if (lineptr == NULL || n == NULL) @@ -89,7 +89,7 @@ _IO_getdelim (lineptr, n, delimiter, fp) t = (char *) memchr ((void *) fp->_IO_read_ptr, delimiter, len); if (t != NULL) len = (t - fp->_IO_read_ptr) + 1; - if (__glibc_unlikely (len >= SSIZE_MAX - cur_len) || + if (__glibc_unlikely (len >= SIZE_MAX - cur_len) || __glibc_unlikely (len >= SSIZE_MAX - result)) { __set_errno (EOVERFLOW);