[blender/f18] Fix crash in blender/makerna/intern/rna_access.c (ä969043)

[Jochen Schmitt]

commit ec17845f45bd0b3b7ff683176d166c175e0e3c24
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Thu Jun 6 18:57:31 2013 +0200

    Fix crash in blender/makerna/intern/rna_access.c (ä969043)

 blender-2.67a-rna.patch |   15 +++++++++++++++
 blender.spec            |   13 +++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/blender-2.67a-rna.patch b/blender-2.67a-rna.patch
new file mode 100644
index 0000000..e0cc74b
--- /dev/null
+++ b/blender-2.67a-rna.patch
@@ -0,0 +1,15 @@
+diff -up blender-2.67a/source/blender/makesrna/intern/rna_access.c.rna blender-2.67a/source/blender/makesrna/intern/rna_access.c
+--- blender-2.67a/source/blender/makesrna/intern/rna_access.c.rna	2013-06-03 17:18:37.070246295 +0200
++++ blender-2.67a/source/blender/makesrna/intern/rna_access.c	2013-06-03 17:37:49.453608060 +0200
+@@ -1273,8 +1273,9 @@ void RNA_property_enum_items_gettexted(b
+ 			int totitem = 0;
+ 
+ 			/* count */
+-			for (i = 0; (*item)[i].identifier; i++)
+-				totitem++;
++			if (*item)
++			  for (i = 0; (*item)[i].identifier; i++)
++			    totitem++;
+ 
+ 			nitem = MEM_callocN(sizeof(EnumPropertyItem) * (totitem + 1), "enum_items_gettexted");
+ 
diff --git a/blender.spec b/blender.spec
index ecb3cd6..e3b4997 100644
--- a/blender.spec
+++ b/blender.spec
@@ -14,7 +14,7 @@
 Name:           blender
 Epoch:          1
 Version:        %{blender_api}a
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -30,7 +30,8 @@ Source10:       macros.blender
 
 Patch1:         blender-2.67-syspath.patch
 Patch2:	        blender-2.67-droid.patch
-Patch3:	        blender-2.67a-non-x86.patch
+Patch3:		blender-2.67a-rna.patch
+Patch4:	        blender-2.67a-non-x86.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -146,7 +147,8 @@ sets.
  
 %patch1 -p1 -b .syspath
 %patch2 -p1 -b .droid
-%patch3 -p1 -b .non-x86
+%patch3 -p1 -b .rna
+%patch4 -p1 -b .non-x86
 
 find -name '.svn' -print | xargs rm -rf
 
@@ -292,6 +294,9 @@ fi || :
 %doc release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
 
 %changelog
+* Mon Jun  3 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.67a-3
+- Fix crash in blender/makerna/intern/rna_access.c (ä969043)
+
 * Sun May 26 2013 Dan Horák <dan[at]danny.cz> - 1:2.67a-2
 - fix build on non-x86 arches
 
@@ -313,7 +318,7 @@ fi || :
 - New upstream release
 
 * Sat Feb 23 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.66-2
-- Fi wrong font name for international feature (#867205)
+- Fix wrong font name for international feature (#867205)
 
 * Thu Feb 21 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.66-1
 - New upstream release