r12926 - in packages/trunk/xmoto/debian: . patches

[Stephen Kitt]

Author: steve-guest
Date: 2011-12-04 13:26:57 +0000 (Sun, 04 Dec 2011)
New Revision: 12926

Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/patches/fix_segfault.patch
Log:
Refresh fix_segfault.patch, add DEP-3 header.

Modified: packages/trunk/xmoto/debian/changelog
===================================================================
--- packages/trunk/xmoto/debian/changelog	2011-12-04 13:21:36 UTC (rev 12925)
+++ packages/trunk/xmoto/debian/changelog	2011-12-04 13:26:57 UTC (rev 12926)
@@ -3,6 +3,8 @@
   * New upstream release (closes: #644234):
     + builds with libpng 1.5 (closes: #649797);
     + uses libxml2.
+  * Update patches:
+    + fix_segfault.patch: refresh, add DEP-3 header.
 
  -- Stephen Kitt <steve at sk2.org>  Wed, 10 Aug 2011 07:12:24 +0200
 

Modified: packages/trunk/xmoto/debian/patches/fix_segfault.patch
===================================================================
--- packages/trunk/xmoto/debian/patches/fix_segfault.patch	2011-12-04 13:21:36 UTC (rev 12925)
+++ packages/trunk/xmoto/debian/patches/fix_segfault.patch	2011-12-04 13:26:57 UTC (rev 12926)
@@ -1,6 +1,10 @@
---- xmoto-0.5.5.orig/src/states/StateMainMenu.cpp
-+++ xmoto-0.5.5/src/states/StateMainMenu.cpp
-@@ -893,6 +893,7 @@
+Description: Avoid segfaulting on NULL values in the database
+Author: Gustavo Noronha Silva <kov at debian.org>
+Origin: other, http://bugs.debian.org/492414
+
+--- xmoto-0.5.9.orig/src/states/StateMainMenu.cpp
++++ xmoto-0.5.9/src/states/StateMainMenu.cpp
+@@ -899,6 +899,7 @@
    int   v_nbDiffLevels    = 0;
    std::string v_level_name= "";
    xmDatabase* pDb = xmDatabase::instance("main");
@@ -8,7 +12,7 @@
    
    if(v_window != NULL){
      delete v_window;
-@@ -910,7 +911,8 @@
+@@ -916,7 +917,8 @@
      pDb->read_DB_free(v_result);
      return;
    }
@@ -18,7 +22,7 @@
    v_since           =      pDb->getResult(v_result, 2, 0, 1);  
    pDb->read_DB_free(v_result);
  
-@@ -926,11 +928,16 @@
+@@ -932,11 +934,16 @@
      pDb->read_DB_free(v_result);
      return;
    }
@@ -40,7 +44,7 @@
    pDb->read_DB_free(v_result);
  
    v_result = pDb->readDB("SELECT COUNT(DISTINCT(id_level)) "
-@@ -993,11 +1000,16 @@
+@@ -999,11 +1006,16 @@
      if(cy + 45 > nHeight) break; /* out of window */
      
      v_level_name      =      pDb->getResult(v_result, 6, i, 0);