diff --git a/NEWS b/NEWS
index efff107d..952038f7 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,7 @@
 - ISO 9660 more accurate more often
 - Add ability to look for ISO 9660 filesystem in unknown Disc image formats
 - Add routine for getting ISO9660 long date; short date fixes
-- remove memory leaks
+- remove even more memory leaks
 - Add enumerations and symbols to facilitate debugging
 - Break out C++ example programs into a separate directory. More C++ programs.
 - gcc 4 fixes
@@ -186,4 +186,4 @@
 0.1
   Routines split off from VCDImager.
 
-$Id: NEWS,v 1.66 2005/03/18 13:21:14 rocky Exp $
+$Id: NEWS,v 1.67 2005/04/11 01:03:46 rocky Exp $
diff --git a/lib/driver/device.c b/lib/driver/device.c
index 9004ce5f..3bc4acbb 100644
--- a/lib/driver/device.c
+++ b/lib/driver/device.c
@@ -1,5 +1,5 @@
 /*
-    $Id: device.c,v 1.26 2005/04/11 00:53:56 rocky Exp $
+    $Id: device.c,v 1.27 2005/04/11 01:03:46 rocky Exp $
 
     Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
 
@@ -367,15 +367,15 @@ cdio_eject_media (CdIo_t **pp_cdio)
   cdio_get_devices_with_cap.
 */
 void 
-cdio_free_device_list (char * device_list[]) 
+cdio_free_device_list (char * ppsz_device_list[]) 
 {
-  char **device_list_save=device_list;
-  if (NULL == device_list) return;
-  for ( ; *device_list != NULL ; device_list++ ) {
-    free(*device_list);
-    *device_list = NULL;
+  char **ppsz_device_list_save=ppsz_device_list;
+  if (!ppsz_device_list) return;
+  for ( ; NULL != *ppsz_device_list ; ppsz_device_list++ ) {
+    free(*ppsz_device_list);
+    *ppsz_device_list = NULL;
   }
-  free(device_list_save);
+  free(ppsz_device_list_save);
 }
 
 
diff --git a/test/testparanoia.c b/test/testparanoia.c
index 56be4c80..56da73fa 100644
--- a/test/testparanoia.c
+++ b/test/testparanoia.c
@@ -77,7 +77,6 @@ main(int argc, const char *argv[])
 
   /* Don't need a list of CD's with CD-DA's any more. */
   cdio_free_device_list(ppsz_cd_drives);
-  free(ppsz_cd_drives);
 
   /* We'll set for verbose paranoia messages. */
   cdda_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT);