[Bf-blender-cvs] [b7c756985a2] workspaces: Revert redundant workaround for buffer overflow

Julian Eisel noreply at git.blender.org
Mon May 8 00:00:44 CEST 2017


Commit: b7c756985a2b5c751c6ef48395a81a801677ede5
Author: Julian Eisel
Date:   Sun May 7 23:57:08 2017 +0200
Branches: workspaces
https://developer.blender.org/rBb7c756985a2b5c751c6ef48395a81a801677ede5

Revert redundant workaround for buffer overflow

This reverts commit 9ddb857c7a9b9ea7ae55ef39879497676d6d8e71.
Should be redundant after rB839bf119c1a774b475.

===================================================================

M	source/blender/editors/interface/interface_regions.c

===================================================================

diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 355b4f4d467..fd6d056f7d4 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -794,12 +794,8 @@ bool UI_search_item_add(uiSearchItems *items, const char *name, void *poin, int
 		return true;
 	}
 	
-	if (items->names) {
-		MEM_freeN(items->names[items->totitem]);
-		int name_len = min_ii(strlen(name) + 1, items->maxstrlen);
-		items->names[items->totitem] = MEM_mallocN(name_len, __func__);
-		BLI_strncpy(items->names[items->totitem], name, name_len);
-	}
+	if (items->names)
+		BLI_strncpy(items->names[items->totitem], name, items->maxstrlen);
 	if (items->pointers)
 		items->pointers[items->totitem] = poin;
 	if (items->icons)




More information about the Bf-blender-cvs mailing list