GUACAMOLE-1875: Merge check return values of WebP API functions.

apache · Nov 7, 2023 · 88ece72 · 88ece72
2 parents f339b48 + c60f40c
commit 88ece72
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/libguac/encode-webp.c b/src/libguac/encode-webp.c
@@ -198,16 +198,22 @@ int guac_webp_write(guac_socket* socket, guac_stream* stream,
     config.method = 2; /* Compression method (0=fast/larger, 6=slow/smaller) */
 
     /* Validate configuration */
-    WebPValidateConfig(&config);
+    if (!WebPValidateConfig(&config)) {
+        return -1;
+    }
 
     /* Set up WebP picture */
-    WebPPictureInit(&picture);
+    if (!WebPPictureInit(&picture)) {
+        return -1;
+    }
     picture.use_argb = 1;
     picture.width = width;
     picture.height = height;
 
     /* Allocate and init writer */
-    WebPPictureAlloc(&picture);
+    if (!WebPPictureAlloc(&picture)) {
+        return -1;
+    }
     picture.writer = guac_webp_stream_write;
     picture.custom_ptr = &writer;
     guac_webp_stream_writer_init(&writer, socket, stream);
@@ -244,15 +250,15 @@ int guac_webp_write(guac_socket* socket, guac_stream* stream,
     }
 
     /* Encode image */
-    WebPEncode(&config, &picture);
+    const int result = WebPEncode(&config, &picture) ? 0 : -1;
 
     /* Free picture */
     WebPPictureFree(&picture);
 
     /* Ensure all data is written */
     guac_webp_flush_data(&writer);
 
-    return 0;
+    return result;
 
 }