[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50990] trunk/blender/source/blender: fix for own bug in bmesh api, setting a byte string customdata layer assumed the input data was 256 length , assigning smaller values would read past the buffer.

[Campbell Barton]

Revision: 50990
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50990
Author:   campbellbarton
Date:     2012-10-01 15:39:29 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
fix for own bug in bmesh api, setting a byte string customdata layer assumed the input data was 256 length, assigning smaller values would read past the buffer.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2012-10-01 15:27:50 UTC (rev 50989)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2012-10-01 15:39:29 UTC (rev 50990)
@@ -1489,6 +1489,8 @@
 						count++;
 						tail++;
 					}
+
+					(void)hdata;  /* quiet warning */
 				}
 				else if (propmode && head != tail) {
 					calc_distanceCurveVerts(head, tail - 1);

Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c	2012-10-01 15:27:50 UTC (rev 50989)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c	2012-10-01 15:39:29 UTC (rev 50990)
@@ -1079,7 +1079,7 @@
 				ret = -1;
 			}
 			else {
-				BLI_strncpy(mstring->s, tmp_val, sizeof(mstring->s));
+				BLI_strncpy(mstring->s, tmp_val, MIN2(PyBytes_Size(py_value), sizeof(mstring->s)));
 			}
 			break;
 		}