flimflam: Don't crash if LockType/RetriesLeft are not specified.

src/device.c

 /*
  *
  *  Connection Manager
  *
  *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  *
@@ skipping 413 matching lines @@
 static void append_ipconfig(DBusMessageIter *dict, void *arg)
 {
         struct connman_device *device = arg;
 
         __connman_ipconfig_foreach(device, append_ipconfig_path, dict);
 }
 
 static void append_unlock_status(DBusMessageIter *dict, void *arg)
 {
         struct connman_device *device = arg;
-        connman_dbus_dict_append_basic(dict, "LockType",
-                                       DBUS_TYPE_STRING,
-                                       &device->cellular.unlock_required);
-        connman_dbus_dict_append_basic(dict, "RetriesLeft",
-                                       DBUS_TYPE_UINT32,
-                                       &device->cellular.unlock_retries);
+        if (device->cellular.unlock_required)
+                connman_dbus_dict_append_basic(dict, "LockType",
+                                               DBUS_TYPE_STRING,
+                                               &device->cellular.unlock_required);
+        if (device->cellular.unlock_retries)
+                connman_dbus_dict_append_basic(dict, "RetriesLeft",
+                                               DBUS_TYPE_UINT32,
+                                               &device->cellular.unlock_retries);
 }
 
 static DBusMessage *get_properties(DBusConnection *conn, DBusMessage *msg,
     void *data)
 {
         struct connman_device *device = data;
         DBusMessage *reply;
         DBusMessageIter array, dict;
         const char *str;
         int val;
@@ skipping 2156 matching lines @@
                 connman_error("%s: failed to register storage", __func__);
         return connman_driver_register(&device_driver);
 }
 
 void __connman_device_cleanup(void)
 {
         connman_driver_unregister(&device_driver);
         connman_storage_unregister(&device_storage);
         dbus_connection_unref(connection);
 }