Changeset 14526 for trunk/libtransmission/session.c

Timestamp:

May 9, 2015, 11:56:35 AM (6 years ago)

Author:

mikedld

Message:

Fix some issues revealed by coverity

File:

• trunk/libtransmission/session.c (modified) (3 diffs)

trunk/libtransmission/session.c

@@ -460 +460 @@
 {
   char * filename;
+  tr_variant oldDict;
   tr_variant fileSettings;
-  tr_variant sessionDefaults;
-  tr_variant tmp;
   bool success;
   tr_error * error = NULL;
@@ -470 +469 @@
   /* initializing the defaults: caller may have passed in some app-level defaults.
    * preserve those and use the session defaults to fill in any missing gaps. */
-  tr_variantInitDict (&sessionDefaults, 0);
-  tr_sessionGetDefaultSettings (&sessionDefaults);
-  tr_variantMergeDicts (&sessionDefaults, dict);
-  tmp = *dict;
-  *dict = sessionDefaults;
-  sessionDefaults = tmp;
+  oldDict = *dict;
+  tr_variantInitDict (dict, 0);
+  tr_sessionGetDefaultSettings (dict);
+  tr_variantMergeDicts (dict, &oldDict);
+  tr_variantFree (&oldDict);
 
   /* if caller didn't specify a config dir, use the default */
@@ -496 +494 @@
 
   /* cleanup */
-  tr_variantFree (&sessionDefaults);
   tr_free (filename);
   return success;