hal/libhal-storage libhal-storage.c,1.24,1.25

Danny Kukawka dkukawka at freedesktop.org
Mon Jan 9 07:19:52 PST 2006


Update of /cvs/hal/hal/libhal-storage
In directory gabe:/tmp/cvs-serv418/libhal-storage

Modified Files:
	libhal-storage.c 
Log Message:
2006-01-09  Danny Kukawka  <danny.kukawka at web.de>

        * libhal-storage/libhal-storage.c: (libhal_drive_find_all_volumes):
        added slightly adopted patch from Chris Spiegel <l at happyjack.org>
        to fix fd.o bug #5279 (added NULL termination of array).



Index: libhal-storage.c
===================================================================
RCS file: /cvs/hal/hal/libhal-storage/libhal-storage.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- libhal-storage.c	2 Nov 2005 15:38:14 -0000	1.24
+++ libhal-storage.c	9 Jan 2006 15:19:50 -0000	1.25
@@ -1490,6 +1490,8 @@
 		result[*num_volumes] = strdup (udis[i]);
 		*num_volumes = (*num_volumes) + 1;
 	}
+	/* set last element (above removed UDI) to NULL for libhal_free_string_array()*/
+	result[*num_volumes] = NULL;
 
 out:
 	libhal_free_string_array (udis);




More information about the hal-commit mailing list