From owner-svn-src-stable-7@FreeBSD.ORG  Fri Sep 28 01:04:11 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 04282106564A;
	Fri, 28 Sep 2012 01:04:11 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E29C58FC0C;
	Fri, 28 Sep 2012 01:04:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8S14AOL039577;
	Fri, 28 Sep 2012 01:04:10 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8S14A5d039575;
	Fri, 28 Sep 2012 01:04:10 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201209280104.q8S14A5d039575@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Fri, 28 Sep 2012 01:04:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241018 - stable/7/lib/libfetch
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Sep 2012 01:04:11 -0000

Author: eadler
Date: Fri Sep 28 01:04:10 2012
New Revision: 241018
URL: http://svn.freebsd.org/changeset/base/241018

Log:
  MFC r240495:
  	Adding missing return statements during error conditions.
  
  PR:		kern/171187
  Approved by:	cperciva (implicit)

Modified:
  stable/7/lib/libfetch/file.c
Directory Properties:
  stable/7/lib/libfetch/   (props changed)

Modified: stable/7/lib/libfetch/file.c
==============================================================================
--- stable/7/lib/libfetch/file.c	Fri Sep 28 01:04:09 2012	(r241017)
+++ stable/7/lib/libfetch/file.c	Fri Sep 28 01:04:10 2012	(r241018)
@@ -49,12 +49,15 @@ fetchXGetFile(struct url *u, struct url_
 
 	f = fopen(u->doc, "r");
 
-	if (f == NULL)
+	if (f == NULL) {
 		fetch_syserr();
+		return (NULL);
+	}
 
 	if (u->offset && fseeko(f, u->offset, SEEK_SET) == -1) {
 		fclose(f);
 		fetch_syserr();
+		return (NULL);
 	}
 
 	return (f);
@@ -76,12 +79,15 @@ fetchPutFile(struct url *u, const char *
 	else
 		f = fopen(u->doc, "w+");
 
-	if (f == NULL)
+	if (f == NULL) {
 		fetch_syserr();
+		return (NULL);
+	}
 
 	if (u->offset && fseeko(f, u->offset, SEEK_SET) == -1) {
 		fclose(f);
 		fetch_syserr();
+		return (NULL);
 	}
 
 	return (f);