[126889] branches/release_2_3/base

[cal at macports.org]

Revision: 126889
          https://trac.macports.org/changeset/126889
Author:   cal at macports.org
Date:     2014-10-16 14:56:33 -0700 (Thu, 16 Oct 2014)
Log Message:
-----------
merge r124145 from trunk: darwintrace: fix off by one error that may have caused incorrect sandbox bounds

 See https://lists.macosforge.org/pipermail/macports-dev/2014-August/027696.html, which was probably caused by this.

Revision Links:
--------------
    https://trac.macports.org/changeset/124145

Modified Paths:
--------------
    branches/release_2_3/base/src/darwintracelib1.0/proc.c

Property Changed:
----------------
    branches/release_2_3/base/


Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,125578,125621,125859,126866,126868
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/gsoc11-statistics/base:79520,79666
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145,125578,125621,125859,126866,126868
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_3/base/src/darwintracelib1.0/proc.c
===================================================================
--- branches/release_2_3/base/src/darwintracelib1.0/proc.c	2014-10-16 21:13:25 UTC (rev 126888)
+++ branches/release_2_3/base/src/darwintracelib1.0/proc.c	2014-10-16 21:56:33 UTC (rev 126889)
@@ -91,7 +91,7 @@
 		if (NULL != (val = getenv(#name))) {\
 			size_t lenName = strlen(#name);\
 			size_t lenVal  = strlen(val);\
-			if (NULL == (variable = malloc(lenName + lenVal + 0 + 1))) {\
+			if (NULL == (variable = malloc(lenName + 1 + lenVal + 1))) {\
 				perror("darwintrace: malloc");\
 				abort();\
 			}\
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141016/63a5a280/attachment-0001.html>