← Back to branch summary

~ubuntu-desktop/gnome-settings-daemon/3.5

« back to all changes in this revision

Viewing changes to debian/patches/power-check-null-devices.patch

  • Committer: Michael Terry
  • Date: 2012-04-25 20:36:41 UTC
  • Revision ID: michael.terry@canonical.com-20120425203641-1zrbo6iolshts67u
https://launchpad.net/bugs/868928
* debian/patches/power-check-null-devices.patch:
  - NULL-guard the return value of up_client_get_devices.
    LP: #868928

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/power-check-null-devices.patch
 
1
Index: gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c
 
2
===================================================================
 
3
--- gnome-settings-daemon-3.4.1.orig/plugins/power/gsd-power-manager.c  2012-04-25 13:57:13.176001372 -0400
 
4
+++ gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c       2012-04-25 16:24:40.153594415 -0400
 
5
@@ -1161,7 +1161,7 @@
 
6
 
 
7
         /* add to database */
 
8
         array = up_client_get_devices (manager->priv->up_client);
 
9
-        for (i=0;i<array->len;i++) {
 
10
+        for (i = 0; array != NULL && i < array->len; i++) {
 
11
                 device = g_ptr_array_index (array, i);
 
12
                 engine_device_add (manager, device);
 
13
                 engine_check_recall (manager, device);