[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54150] trunk/blender/source/blender/ editors/interface/interface_icons.c: Fix for wrong icons buffer initialization happens for cards

[Sergey Sharybin]

Revision: 54150
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54150
Author:   nazgul
Date:     2013-01-28 12:57:56 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
Fix for wrong icons buffer initialization happens for cards
without NPOT support. Was wrong stride used for memcpy leading
to wrong memory writes in def_internal_icon.

It's a regression since matcap commit.

Should fix the following reports:
- #33993: Crash on Blender startup (Vista x32)
- #33996: Latest build crashes on win xp

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_icons.c

Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c	2013-01-28 12:42:38 UTC (rev 54149)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c	2013-01-28 12:57:56 UTC (rev 54150)
@@ -169,7 +169,7 @@
 				/* this code assumes square images */
 				imgsize = bbuf->x;
 				for (y = 0; y < size; y++) {
-					memcpy(&iimg->rect[y * size], &bbuf->rect[(y + yofs) * imgsize + xofs], imgsize * sizeof(int));
+					memcpy(&iimg->rect[y * size], &bbuf->rect[(y + yofs) * imgsize + xofs], size * sizeof(int));
 				}
 			}
 		}