From patchwork Fri Aug 14 15:47:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Pluzhnikov X-Patchwork-Id: 507483 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 4D3911401EF for ; Sat, 15 Aug 2015 01:48:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=FnOIl4ML; 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:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; q=dns; s=default; b=C64q TrjKbIOPjfc/RzMFzSds+iNqyB5w7oCjjRW3k0Nfwtnz6vXyoCa+XQW0AmzO5YKj AU26hfHOplEa23OAGQYhrr0I+7TmjOXCmlv4ptqz3EqF/10V02/ojYVMZDgXC1Ov 3sDDCOPPQalHoDcPp0RoJr5ME3JQSsiXLH8KWLU= 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:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; s=default; bh=wW6krgnjoJ qPwKNZ16d1ThLqlbI=; b=FnOIl4MLb3awco8KX8pmgWDFGdyRxu2cP/5o4j5n3d tONT4lvNjdlwSMxZSx5IsFLjHqal3LO08N6JJjetjYb3vC1mIJHXQ18cbPrisXwX JAgtITtjG5KS0kjBmClcaYgCl/0PsqdFHPQ6qx9e4K4wuuKRTk0KArC9y2UCQuzb k= Received: (qmail 108548 invoked by alias); 14 Aug 2015 15:48:31 -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 108534 invoked by uid 89); 14 Aug 2015 15:48:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-vk0-f51.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=GpwaY62frAnHlqoo6bRWicqg4Ldi5yAI87pzQ1MJHqM=; b=LI9ayLJd/EKzpHQJuqpI/gpqCH4OMqRSuT9sBF76zwSWwAeBKz6mJSB0O4H6fxUv8P RJOw4Eewj8F8X+znJgVzoQ/kIje0JLMDpoLF4P8be47iJTgvD0Cu//uo9KHRiVX8eqat Sh9pPLInrz2bhzEn0n8EXc5/sG42X7ZSzsoCM64E8IxT+QSBs73XhI+ZVWsx6r2jB3qw evikVJHwV5SRJU49ZAFKCbcBUzfXN6tY3N7vXkoei5MLLT0GEmHo/c0cDIY1OKiS7GSm wDX4O9JzUw2SNTU9lm5+ZpTurHVowEbnpdh15i6gMVY+mj2MPzSO65h/GxT2ggZu7TIU P12w== X-Gm-Message-State: ALoCoQmbZhI6YF7Owwc6NX6omH10zC+1cxJCKGws6JEzi0Z37iE0Z7+3s79TfS3ef4MmKy3Df6bk X-Received: by 10.53.5.37 with SMTP id cj5mr56304663vdd.34.1439567306595; Fri, 14 Aug 2015 08:48:26 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <87wpwywcj5.fsf@igel.home> References: <87wpwywcj5.fsf@igel.home> From: Paul Pluzhnikov Date: Fri, 14 Aug 2015 08:47:57 -0700 Message-ID: Subject: Re: Fix BZ #18757 - fmemopen fails to set errno on failure To: Andreas Schwab Cc: GLIBC Devel On Fri, Aug 14, 2015 at 12:32 AM, Andreas Schwab wrote: > Paul Pluzhnikov writes: > >> @@ -196,7 +197,10 @@ _IO_fopencookie (cookie, mode, io_functions) >> >> new_f = (struct locked_FILE *) malloc (sizeof (struct locked_FILE)); >> if (new_f == NULL) >> - return NULL; >> + { >> + __set_errno (ENOMEM); > > This will overwrite the errno set by malloc. Thanks. Corrected patch attached. 2015-08-13 Paul Pluzhnikov [BZ #18757] * libio/iofopncook.c (_IO_fopencookie): Set errno on failure * libio/test-fmemopen.c (do_bz18820): Extend the test to cover BZ #18757 diff --git a/libio/iofopncook.c b/libio/iofopncook.c index b845d29..978a7fa 100644 --- a/libio/iofopncook.c +++ b/libio/iofopncook.c @@ -189,6 +189,7 @@ _IO_fopencookie (cookie, mode, io_functions) read_write = _IO_NO_READS|_IO_IS_APPENDING; break; default: + __set_errno (EINVAL); return NULL; } if (mode[0] == '+' || (mode[0] == 'b' && mode[1] == '+')) diff --git a/libio/test-fmemopen.c b/libio/test-fmemopen.c index e8e757f..a62f664 100644 --- a/libio/test-fmemopen.c +++ b/libio/test-fmemopen.c @@ -19,6 +19,7 @@ static char buffer[] = "foobar"; +#include #include #include #include @@ -30,6 +31,7 @@ do_bz18820 (void) char ch; FILE *stream; + errno = 0; stream = fmemopen (&ch, 1, "?"); if (stream) { @@ -37,6 +39,11 @@ do_bz18820 (void) fclose (stream); return 1; } + if (errno != EINVAL) + { + printf ("fmemopen: got %i, expected EINVAL (%i)\n", errno, EINVAL); + return 10; + } stream = fmemopen (NULL, 42, "?"); if (stream) @@ -46,6 +53,20 @@ do_bz18820 (void) return 2; } + errno = 0; + stream = fmemopen (NULL, ~0, "w"); + if (stream) + { + printf ("fmemopen: expected NULL, got %p\n", stream); + fclose (stream); + return 3; + } + if (errno != ENOMEM) + { + printf ("fmemopen: got %i, expected ENOMEM (%i)\n", errno, ENOMEM); + return 20; + } + return 0; }