From owner-p4-projects@FreeBSD.ORG  Mon Apr 15 20:44:18 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id DCB9AC0D; Mon, 15 Apr 2013 20:44:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9A612C0B
 for <perforce@freebsd.org>; Mon, 15 Apr 2013 20:44:17 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8B8761AAF
 for <perforce@freebsd.org>; Mon, 15 Apr 2013 20:44:17 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r3FKiHBc055277
 for <perforce@freebsd.org>; Mon, 15 Apr 2013 20:44:17 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r3FKiHXa055274
 for perforce@freebsd.org; Mon, 15 Apr 2013 20:44:17 GMT
 (envelope-from brooks@freebsd.org)
Date: Mon, 15 Apr 2013 20:44:17 GMT
Message-Id: <201304152044.r3FKiHXa055274@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 227750 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Apr 2013 20:44:18 -0000

http://p4web.freebsd.org/@@227750?ac=10

Change 227750 by brooks@brooks_zenith on 2013/04/15 20:43:21

	Reset the exec indicator global on each use so we don't make all
	images red after the first exec backdoor is used.
	
	Reported by:	rwatson

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/decode_png.c#7 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libimagebox/decode_png.c#7 (text+ko) ====

@@ -55,6 +55,8 @@
 	png_infop end_info = NULL;
 	png_bytep *rows = NULL;
 
+	png_exec_triggered = 0;
+
 	ids->is->times[1] = sysarch(MIPS_GET_COUNT, 0);
 
 	if ((png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,