From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/7563 Path: news.gmane.org!not-for-mail From: Kevin Bowling Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] Return rv if memory is not 'calloc'ed in getgrent_a Date: Fri, 1 May 2015 05:17:37 -0700 Message-ID: Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11c32448a1d7cd0515043288 X-Trace: ger.gmane.org 1430482689 8982 80.91.229.3 (1 May 2015 12:18:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 1 May 2015 12:18:09 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-7576-gllmg-musl=m.gmane.org@lists.openwall.com Fri May 01 14:17:57 2015 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1Yo9tE-0002kB-Gg for gllmg-musl@m.gmane.org; Fri, 01 May 2015 14:17:56 +0200 Original-Received: (qmail 19592 invoked by uid 550); 1 May 2015 12:17:54 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 19553 invoked from network); 1 May 2015 12:17:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:date:message-id:subject:from:to:content-type; bh=qxhZ5OBm4MU7JwRFlkMyw3sFa8+SZJvP4awPtag2zfU=; b=eONu2d5OM95hLg9cng1CCym1pdwXYPWD+9izxh1dPBwVmEQ3Xq5vgNScEc0hikRN1F DdqXb7owIM0qQTdBo86jQK+xb/wEbCyFJMcZxhPZ8avssquQoANJ2ayBrVOwCY5amno/ C3Ho/o5RziCo0qW+lyi7ZOx/iYGms4smbEVYU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=qxhZ5OBm4MU7JwRFlkMyw3sFa8+SZJvP4awPtag2zfU=; b=aPLxr9c7ruRC1Kb+rubkNcq7+7vGx9nT1Joqsgqqrv5bH5ZMWNJFRmwXrHwkVnYCM3 PW4irzAobDO5dFGYtWiJrXDv/YP5uxE13M1S1m0i9+nv2InS8kRqXRtRXQ0zWykniQEJ GpG81u1y1UPwinbMdhzN3Q2u8u5Xq84jxzXukiRNbfPGdD1et1jBKJhec4bOMk1Ty1Of smZokMJeEgflip2Es2eB6O0VdmXYpW5jaZRhIT604hE4FUOvEVi6nH3ICrnSAy7bvbvo 5yGRfH4vbg6KIbqJ43ja7qdBsxXZd8+C5lvHsC4P4zi7g2VUx0rCZslyFt248ybp9FH6 s8/g== X-Gm-Message-State: ALoCoQnrrpkbfaF5GwfHZr/lfxlwcOBaxpcbH5U63QVNaSLzOS980UsS0diQ4tAvfHm7Y1Vw4TfQ X-Received: by 10.43.146.67 with SMTP id jx3mr2423886icc.63.1430482657057; Fri, 01 May 2015 05:17:37 -0700 (PDT) Xref: news.gmane.org gmane.linux.lib.musl.general:7563 Archived-At: --001a11c32448a1d7cd0515043288 Content-Type: text/plain; charset=UTF-8 >From 714875b1a614c4ac3b7a04a9d419b7f57d28e336 Mon Sep 17 00:00:00 2001 From: Kevin Bowling Date: Fri, 1 May 2015 05:11:12 -0700 Subject: [PATCH] Return rv if memory is not 'calloc'ed in getgrent_a --- src/passwd/getgrent_a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/passwd/getgrent_a.c b/src/passwd/getgrent_a.c index ecd2f2e..80fbc42 100644 --- a/src/passwd/getgrent_a.c +++ b/src/passwd/getgrent_a.c @@ -48,7 +48,7 @@ int __getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***m rv = errno; free(*line); *line = 0; - return 0; + return rv; } if (*mems) { mem[0][0] = mems; -- 2.3.7 --001a11c32448a1d7cd0515043288 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
From 714875b1a614c4ac3b7a04a9d419b7f57d28e336 Mon Sep 17 0= 0:00:00 2001
From: Kevin Bowling <kevin.bowling@kev009.com>
Date: Fri, 1 May 2015 05:11:12= -0700
Subject: [PATCH] Return rv if memory is not 'calloc'ed in= getgrent_a

---
=C2=A0src/passwd/getgrent_a.c | 2 +-
=C2=A01 f= ile changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/passwd/g= etgrent_a.c b/src/passwd/getgrent_a.c
index ecd2f2e..80fbc42 100644
-= -- a/src/passwd/getgrent_a.c
+++ b/src/passwd/getgrent_a.c
@@ -48,7 += 48,7 @@ int __getgrent_a(FILE *f, struct group *gr, char **line, size_t *si= ze, char ***m
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 rv= =3D errno;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 free= (*line);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *line = =3D 0;
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return 0;
+= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return rv;
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 }
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (*mems) {
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 mem[0][0] =3D mems;
--<= br>2.3.7
--001a11c32448a1d7cd0515043288--