Fix ibv_get_device_list() to really NULL-terminate the array

Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/ChangeLog b/ChangeLog
index 41790e28b7509f09f3f3416f82a6162f80278a31..62780319fdf26ae9abe2bc7a3daff9e394b11fe4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+2006-06-01  Roland Dreier  <rdreier@cisco.com>
+
+       * src/device.c (ibv_get_device_list): Actually return a
+       NULL-terminated array as the documentation promises.
+
 2006-05-31  Roland Dreier  <rdreier@cisco.com>
 
        * src/init.c (find_drivers), src/device.c (ibv_open_device): Fix
-       memleaks: the result of asprintf() needs to be freed when we're
-       done with it.
+       memory leaks: the result of asprintf() needs to be freed when
+       we're done with it.
 
        * examples/asyncwatch.c (event_name_str): Print human-readable
        form of IBV_EVENT_CLIENT_REREGISTER.

diff --git a/src/device.c b/src/device.c
index 4eee31c77d564826111a2ba457ae86f0cee2ff2e..4ceb6400cd140141a98a9c1ba952182acc46998b 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -63,7 +63,7 @@ struct ibv_device **ibv_get_device_list(int *num)
        if (!num_devices)
                num_devices = ibverbs_init(&device_list);
 
-       l = calloc(num_devices, sizeof (struct ibv_device *));
+       l = calloc(num_devices + 1, sizeof (struct ibv_device *));
        for (i = 0; i < num_devices; ++i)
                l[i] = device_list[i];