summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2009-07-10 19:01:09 +0200
committerGravatar Matt Colyer2009-07-18 10:39:42 -0700
commit5fa071717799ee2424c41b62360c7122b104fefb (patch)
tree51896d237e6768902d33c776204530bf78d60fff
parentb8ce722ffaeab22e141e18907c46bbed4659d857 (diff)
downloadlibimobiledevice-5fa071717799ee2424c41b62360c7122b104fefb.tar.gz
libimobiledevice-5fa071717799ee2424c41b62360c7122b104fefb.tar.bz2
Use new plist_copy instead of serialization workaround in lockdownd_et_value()
-rw-r--r--dev/lckdclient.c7
-rw-r--r--src/lockdown.c12
2 files changed, 5 insertions, 14 deletions
diff --git a/dev/lckdclient.c b/dev/lckdclient.c
index e197002..e7ad962 100644
--- a/dev/lckdclient.c
+++ b/dev/lckdclient.c
@@ -74,19 +74,20 @@ int main(int argc, char *argv[])
loop = FALSE;
if (!strcmp(*args, "get") && len >= 2) {
- plist_t *value = NULL;
+ plist_t value = NULL;
if (IPHONE_E_SUCCESS == lockdownd_get_value(client, len == 3 ? *(args + 1):NULL, len == 3 ? *(args + 2):*(args + 1), &value))
{
char *xml = NULL;
uint32_t length;
plist_to_xml(value, &xml, &length);
printf("Success : value = %s\n", xml);
-
free(xml);
- free(value);
}
else
printf("Error\n");
+
+ if (value)
+ plist_free(value);
}
if (!strcmp(*args, "start") && len == 2) {
diff --git a/src/lockdown.c b/src/lockdown.c
index 7e1f1a8..24283cb 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -445,14 +445,8 @@ iphone_error_t lockdownd_get_value(lockdownd_client_t client, const char *domain
plist_get_key_val(value_key_node, &result_key);
if (!strcmp(result_key, "Value")) {
- char *buf = NULL;
- uint32_t length;
log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_get_value(): has a value\n");
-
- /* FIXME: libplist does not offer cloning of nodes, use serialization */
- plist_to_bin(value_value_node, &buf, &length);
- plist_from_bin(buf, length, value_node);
- free(buf);
+ *value_node = plist_copy(value_value_node);
}
free(result_key);
}
@@ -469,7 +463,6 @@ iphone_error_t lockdownd_get_device_uid(lockdownd_client_t client, char **uid)
{
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
plist_t value = NULL;
- value = plist_new_dict();
ret = lockdownd_get_value(client, NULL, "UniqueDeviceID", &value);
if (ret != IPHONE_E_SUCCESS) {
@@ -492,7 +485,6 @@ iphone_error_t lockdownd_get_device_public_key(lockdownd_client_t client, gnutls
plist_t value = NULL;
char *value_value = NULL;
uint64_t size = 0;
- value = plist_new_dict();
ret = lockdownd_get_value(client, NULL, "DevicePublicKey", &value);
if (ret != IPHONE_E_SUCCESS) {
@@ -519,14 +511,12 @@ iphone_error_t lockdownd_get_device_name(lockdownd_client_t client, char **devic
{
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
plist_t value = NULL;
- value = plist_new_dict();
ret = lockdownd_get_value(client, NULL, "DeviceName", &value);
if (ret != IPHONE_E_SUCCESS) {
return ret;
}
plist_get_string_val(value, device_name);
- log_debug_msg("%s: %s\n", __func__, device_name);
plist_free(value);
value = NULL;