From owner-p4-projects@FreeBSD.ORG  Tue Jun 18 09:03:23 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id F26445E9; Tue, 18 Jun 2013 09:03:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B37F65E7
 for <perforce@freebsd.org>; Tue, 18 Jun 2013 09:03:22 +0000 (UTC)
 (envelope-from jonathan@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks6.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A52DD18A7
 for <perforce@freebsd.org>; Tue, 18 Jun 2013 09:03:22 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5I93M1B074977
 for <perforce@freebsd.org>; Tue, 18 Jun 2013 09:03:22 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5I93MBv074974
 for perforce@freebsd.org; Tue, 18 Jun 2013 09:03:22 GMT
 (envelope-from jonathan@freebsd.org)
Date: Tue, 18 Jun 2013 09:03:22 GMT
Message-Id: <201306180903.r5I93MBv074974@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jonathan@freebsd.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Subject: PERFORCE change 229863 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: Tue, 18 Jun 2013 09:03:23 -0000

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

Change 229863 by jonathan@jonathan-on-zenith on 2013/06/18 09:02:57

	Ensure we don't create too many cloines.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_update.c#5 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_update.c#5 (text+ko) ====

@@ -89,6 +89,8 @@
 
 	print_class(class);
 
+	int error = TESLA_SUCCESS;
+
 	// Did we match any instances?
 	bool matched_something = false;
 
@@ -97,13 +99,15 @@
 
 	// Make space for cloning existing instances.
 	size_t cloned = 0;
+	const size_t max_clones = class->tc_free;
 	struct clone_info {
 		tesla_instance *old;
 		const tesla_transition *transition;
-	} clones[class->tc_free];
+	} clones[max_clones];
 
 	// Iterate over existing instances, figure out what to do with each.
 	for (uint32_t i = 0; i < class->tc_limit; i++) {
+		assert(class->tc_instances != NULL);
 		tesla_instance *inst = class->tc_instances + i;
 
 		const tesla_transition *trigger = NULL;
@@ -129,6 +133,11 @@
 			break;
 
 		case FORK: {
+			if (cloned >= max_clones) {
+				error = TESLA_ERROR_ENOMEM;
+				goto cleanup;
+			}
+
 			struct clone_info *clone = clones + cloned++;
 			clone->old = inst;
 			clone->transition = trigger;
@@ -190,9 +199,9 @@
 	print_class(class);
 	PRINT("\n====\n\n");
 
+cleanup:
 	tesla_class_put(class);
-
-	return (TESLA_SUCCESS);
+	return error;
 }
 
 enum tesla_action_t