When asprintf returns -1, the pointer is undefined. Assert on failure, mostly
to shut up coverity.

Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
 test/dbverify.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/dbverify.c b/test/dbverify.c
index a4cd1bd..5a4b687 100644
--- a/test/dbverify.c
+++ b/test/dbverify.c
@@ -56,7 +56,7 @@ rmtmpdir(const char *dir)
        nfiles = scandir(dir, &files, scandir_filter, alphasort);
        while(nfiles--)
        {
-               asprintf(&path, "%s/%s", dir, files[nfiles]->d_name);
+               assert(asprintf(&path, "%s/%s", dir, files[nfiles]->d_name) != 
-1);
                assert(path);
                remove(path);
                free(files[nfiles]);
@@ -140,10 +140,10 @@ compare_written_database(WacomDeviceDatabase *db)
                int nstyli;
                const int *styli;
 
-               asprintf(&path, "%s/%d-%04x-%04x.tablet", dirname,
+               assert(asprintf(&path, "%s/%d-%04x-%04x.tablet", dirname,
                                libwacom_get_bustype(*device),
                                libwacom_get_vendor_id(*device),
-                               libwacom_get_product_id(*device));
+                               libwacom_get_product_id(*device)) != -1);
                assert(path);
                fd = open(path, O_WRONLY|O_CREAT, S_IRWXU);
                assert(fd >= 0);
@@ -156,7 +156,7 @@ compare_written_database(WacomDeviceDatabase *db)
                        int fd_stylus;
                        const WacomStylus *stylus;
 
-                       asprintf(&path, "%s/%#x.stylus", dirname, styli[i]);
+                       assert(asprintf(&path, "%s/%#x.stylus", dirname, 
styli[i]) != -1);
                        stylus = libwacom_stylus_get_for_id(db, styli[i]);
                        assert(stylus);
                        fd_stylus = open(path, O_WRONLY|O_CREAT, S_IRWXU);
-- 
2.4.1


------------------------------------------------------------------------------
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to