[oolite] 03/06: patches/avoid_infinite_recursion_in_verify_descriptions.diff.

[Nicolas Boulenguez]

This is an automated email from the git hooks/post-receive script.

nicobou-guest pushed a commit to branch master
in repository oolite.

commit b4557d25a169e46a575b5acc9a5a31c5276c3d6e
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date:   Wed Sep 2 23:05:47 2015 +0200

    patches/avoid_infinite_recursion_in_verify_descriptions.diff.
---
 debian/changelog                                      |  1 +
 ...oid_infinite_recursion_in_verify_descriptions.diff | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 99ce730..fbd1845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ oolite (1.82-1) UNRELEASED; urgency=medium
     to PDF, lowering the severity of #730893.
   * allow -Werror=format-security, default with gcc-5. Closes: #778039.
   * patches/avoid_date_cpp_macro.diff: for reproducible builds.
+  * patches/avoid_infinite_recursion_in_verify_descriptions.diff.
 
  -- Nicolas Boulenguez <nicolas at debian.org>  Mon, 24 Aug 2015 15:44:03 +0200
 
diff --git a/debian/patches/avoid_infinite_recursion_in_verify_descriptions.diff b/debian/patches/avoid_infinite_recursion_in_verify_descriptions.diff
new file mode 100644
index 0000000..b9826d9
--- /dev/null
+++ b/debian/patches/avoid_infinite_recursion_in_verify_descriptions.diff
@@ -0,0 +1,19 @@
+Description: avoid an infinite recursion between VerifyDesc and descriptions.
+Author: Nicolas Boulenguez <nicolas at debian.org>
+
+--- a/src/Core/Universe.m
++++ b/src/Core/Universe.m
+@@ -7454,11 +7454,10 @@
+ 		-- Ahruman 2011-05-05
+ 	*/
+ 	
+-	NSDictionary *descriptions = [self descriptions];
+ 	NSString *key = nil;
+-	foreachkey (key, descriptions)
++	foreachkey (key, _descriptions)
+ 	{
+-		VerifyDesc(key, [descriptions objectForKey:key]);
++		VerifyDesc(key, [_descriptions objectForKey:key]);
+ 	}
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ce06cab..88cc773 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ add_keywords_to_desktop_file.diff
 secure-format-log-string.diff
 # gnustep_app_builder.diff
 avoid_date_cpp_macro.diff
+avoid_infinite_recursion_in_verify_descriptions.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/oolite.git