From owner-p4-projects@FreeBSD.ORG  Thu Dec 13 21:26:08 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id B9C6B4E7; Thu, 13 Dec 2012 21:26:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 79E084E5
 for <perforce@freebsd.org>; Thu, 13 Dec 2012 21:26:07 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 5E1C98FC13
 for <perforce@freebsd.org>; Thu, 13 Dec 2012 21:26:07 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBDLQ7jW063236
 for <perforce@freebsd.org>; Thu, 13 Dec 2012 21:26:07 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBDLQ7tk063233
 for perforce@freebsd.org; Thu, 13 Dec 2012 21:26:07 GMT
 (envelope-from brooks@freebsd.org)
Date: Thu, 13 Dec 2012 21:26:07 GMT
Message-Id: <201212132126.qBDLQ7tk063233@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 219903 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: Thu, 13 Dec 2012 21:26:08 -0000

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

Change 219903 by brooks@brooks_zenith on 2012/12/13 21:25:16

	Use a per-instance offset rather than a bogus global one.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/readpng-cheri.c#6 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/libexec/readpng-cheri/readpng-cheri.c#6 (text+ko) ====

@@ -46,13 +46,14 @@
 
 int pngwidth;
 
-int offset = 0;
 static void
 cheri_read_data(png_structp png_ptr __unused, png_bytep data, png_size_t length)
 {
-      
-	memcpy_fromcap(data, 2, offset, length);
-	offset += length;
+	struct ibox_decode_state *ids;
+
+	ids = png_get_io_ptr(png_ptr);
+	memcpy_fromcap(data, 2, ids->offset, length);
+	ids->offset += length;
 }
 
 static void
@@ -92,6 +93,7 @@
 	is.sb = SB_CHERI;
 
 	ids.fd = -1;
+	ids.offset = 0;
 	/*
 	 * in principle we could update this via a capabilty,
 	 * but in practice we can reconstruct it on exit