[112417] branches/release_2_2

[jmr at macports.org]

Revision: 112417
          https://trac.macports.org/changeset/112417
Author:   jmr at macports.org
Date:     2013-10-22 06:21:29 -0700 (Tue, 22 Oct 2013)
Log Message:
-----------
merge r110985 from trunk:
 fix overlap check aborts

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

Modified Paths:
--------------
    branches/release_2_2/base/src/pextlib1.0/strsed.c

Property Changed:
----------------
    branches/release_2_2/
    branches/release_2_2/base/


Property changes on: branches/release_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:107106,107465,107527,107674,107753,108406,109869
   + /trunk:107106,107465,107527,107674,107753,108406,109869,110985


Property changes on: branches/release_2_2/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/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:106802,106807,106809-106810,107106,107465,107527,107674,107753,108406,109869
/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/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:106802,106807,106809-106810,107106,107465,107527,107674,107753,108406,109869,110985
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_2/base/src/pextlib1.0/strsed.c
===================================================================
--- branches/release_2_2/base/src/pextlib1.0/strsed.c	2013-10-22 13:18:14 UTC (rev 112416)
+++ branches/release_2_2/base/src/pextlib1.0/strsed.c	2013-10-22 13:21:29 UTC (rev 112417)
@@ -662,7 +662,7 @@
 
 	    if (need > 0){
 		more_space(need);
-		strncpy(new_str + new_pos, str, need);
+		memmove(new_str + new_pos, str, need);
 		new_pos += need;
 	    }
 
@@ -756,7 +756,7 @@
      *
      */
     more_space(str_len);
-    (void) strcpy(new_str + new_pos, str);
+    (void) memmove(new_str + new_pos, str, strlen(str) + 1);
     RETURN(new_str);
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131022/26a390b8/attachment.html>