[SCM] gsequencer/master: fixed possible NULL pointer dereference

[jkraehemann-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2352dcab83543844aa9fa3ba74a2664c2f8735a2
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Thu Mar 16 23:34:13 2017 +0100

    fixed possible NULL pointer dereference

diff --git a/debian/patches/fix-null-pointer-dereference.diff b/debian/patches/fix-null-pointer-dereference.diff
index 912e57c..7669584 100644
--- a/debian/patches/fix-null-pointer-dereference.diff
+++ b/debian/patches/fix-null-pointer-dereference.diff
@@ -1,6 +1,38 @@
 --- a/ags/X/file/ags_simple_file.c
 +++ b/ags/X/file/ags_simple_file.c
-@@ -2255,7 +2255,8 @@
+@@ -1302,10 +1302,10 @@
+ 	    current = iter->data;
+ 	  }
+ 	}
+-	
++
+ 	ags_simple_file_read_property(simple_file, child, &current);
+ 	list = g_list_prepend(list, current);
+-
++	
+ 	i++;
+       }
+     }
+@@ -1625,12 +1625,15 @@
+ 
+ 	  iter = g_list_nth(*machine,
+ 			    i);
+-	  current = iter->data;
++
++	  if(iter != NULL){
++	    current = iter->data;
++	  }
+ 	}
+-	
++
+ 	ags_simple_file_read_machine(simple_file, child, &current);
+ 	list = g_list_prepend(list, current);
+-
++	
+ 	i++;
+       }
+     }
+@@ -2255,7 +2258,8 @@
      ags_ffplayer_open_filename(ffplayer,
  			       str);
  
@@ -10,3 +42,77 @@
        return;
      }
      
+@@ -2566,7 +2570,10 @@
+ 
+ 	  iter = g_list_nth(*pad,
+ 			    i);
+-	  current = iter->data;
++
++	  if(iter != NULL){
++	    current = iter->data;
++	  }
+ 	}
+ 	
+ 	ags_simple_file_read_pad(simple_file, child, &current);
+@@ -2786,12 +2793,15 @@
+ 
+ 	  iter = g_list_nth(*line,
+ 			    i);
+-	  current = iter->data;
++
++	  if(iter != NULL){
++	    current = iter->data;
++	  }
+ 	}
+-	
++
+ 	ags_simple_file_read_line(simple_file, child, &current);
+ 	list = g_list_prepend(list, current);
+-
++	
+ 	i++;
+       }
+     }
+@@ -3675,7 +3685,10 @@
+ 
+ 	  iter = g_list_nth(*effect_line,
+ 			    i);
+-	  current = iter->data;
++
++	  if(iter != NULL){
++	    current = iter->data;
++	  }
+ 	}
+ 	
+ 	ags_simple_file_read_effect_line(simple_file, child, &current);
+@@ -4186,7 +4199,10 @@
+ 
+ 	  iter = g_list_nth(*notation,
+ 			    i);
+-	  current = iter->data;
++
++	  if(iter != NULL){
++	    current = iter->data;
++	  }
+ 	}
+ 	
+ 	ags_simple_file_read_notation(simple_file, child, &current);
+@@ -4375,12 +4391,15 @@
+ 
+ 	  iter = g_list_nth(*automation,
+ 			    i);
+-	  current = iter->data;
++
++	  if(iter != NULL){
++	    current = iter->data;
++	  }
+ 	}
+-	
++
+ 	ags_simple_file_read_automation(simple_file, child, &current);
+ 	list = g_list_prepend(list, current);
+-
++	
+ 	i++;
+       }
+     }

-- 
gsequencer packaging