]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
libcacard: Plug memory leaks around vreader_get_reader_list()
authorMarkus Armbruster <armbru@redhat.com>
Fri, 23 May 2014 11:24:34 +0000 (13:24 +0200)
committerMichael Tokarev <mjt@tls.msk.ru>
Fri, 23 May 2014 20:45:57 +0000 (00:45 +0400)
Spotted by Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
libcacard/vcard_emul_nss.c
libcacard/vscclient.c

index 75b9d79412cdb11e80f687eafe21f75b91f94546..78265932fa6b09e117034297891aa1c71dcfcd77 100644 (file)
@@ -433,11 +433,13 @@ vcard_emul_find_vreader_from_slot(PK11SlotInfo *slot)
         VReader *reader = vreader_list_get_reader(current_entry);
         VReaderEmul *reader_emul = vreader_get_private(reader);
         if (reader_emul->slot == slot) {
+            vreader_list_delete(reader_list);
             return reader;
         }
         vreader_free(reader);
     }
 
+    vreader_list_delete(reader_list);
     return NULL;
 }
 
@@ -1059,6 +1061,8 @@ vcard_emul_replay_insertion_events(void)
         next_entry = vreader_list_get_next(current_entry);
         vreader_queue_card_event(vreader);
     }
+
+    vreader_list_delete(list);
 }
 
 /*
index 29f4958089b37e6ba799901b9be76c2a969e6560..f2a753a417a6b4b1e5d068cea999d334eae95b54 100644 (file)
@@ -570,6 +570,7 @@ do_command(GIOChannel *source,
                        "CARD_PRESENT" : "            ",
                        vreader_get_name(reader));
             }
+            vreader_list_delete(list);
         } else if (*string != 0) {
             printf("valid commands:\n");
             printf("insert [reader_id]\n");