From owner-p4-projects@FreeBSD.ORG Sun Jul 8 05:54:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35CC916A46D; Sun, 8 Jul 2007 05:54:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D675516A46B for ; Sun, 8 Jul 2007 05:54:09 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C31E413C480 for ; Sun, 8 Jul 2007 05:54:09 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l685s9JP037457 for ; Sun, 8 Jul 2007 05:54:09 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l685s9DB037453 for perforce@freebsd.org; Sun, 8 Jul 2007 05:54:09 GMT (envelope-from andrew@freebsd.org) Date: Sun, 8 Jul 2007 05:54:09 GMT Message-Id: <200707080554.l685s9DB037453@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123086 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2007 05:54:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=123086 Change 123086 by andrew@andrew_hermies on 2007/07/08 05:53:54 When reading past the end of an array return NULL rather then failing an assert Affected files ... .. //depot/projects/soc2007/andrew-update/lib/facund_object.c#6 edit Differences ... ==== //depot/projects/soc2007/andrew-update/lib/facund_object.c#6 (text+ko) ==== @@ -288,7 +288,8 @@ assert(obj != NULL); assert(obj->obj_type == FACUND_ARRAY); assert(obj->obj_assigned == 1); - assert(pos < obj->obj_array_count); + if (pos >= obj->obj_array_count) + return NULL; obj->obj_error = FACUND_OBJECT_ERROR_NONE; return obj->obj_array[pos];