chafa: Move image size helper to util

Author: zouyonghe

tests/Makefile.am

@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 SUBDIRS = data
 
 AM_CFLAGS = $(LIBCHAFA_CFLAGS) $(GLIB_CFLAGS)
@@ -26,7 +28,8 @@ canvas_test_SOURCES = \
 	canvas-test.c
 
 loader_arithmetic_test_SOURCES = \
-	loader-arithmetic-test.c
+	loader-arithmetic-test.c \
+	$(top_srcdir)/tools/chafa/chicle-util.c
 
 term_info_test_SOURCES = \
 	term-info-test.c

tests/loader-arithmetic-test.c

@@ -1,7 +1,7 @@
 #include "config.h"
 
 #include <chafa.h>
-#include "chicle-image-size.h"
+#include "chicle-util.h"
 
 #define IMAGE_BUFFER_SIZE_MAX (0xffffffffU >> 2)
 

tools/chafa/Makefile.am

@@ -13,7 +13,6 @@ chafa_SOURCES = \
 	chicle-gif-loader.h \
 	chicle-grid-layout.c \
 	chicle-grid-layout.h \
-	chicle-image-size.h \
 	chicle-media-loader.c \
 	chicle-media-loader.h \
 	chicle-media-pipeline.c \

tools/chafa/chicle-avif-loader.c

@@ -31,7 +31,6 @@
 #include <chafa.h>
 #include <avif/avif.h>
 #include "chicle-avif-loader.h"
-#include "chicle-image-size.h"
 #include "chicle-util.h"
 
 #define N_CHANNELS 4

tools/chafa/chicle-heif-loader.c

@@ -31,7 +31,7 @@
 #include <chafa.h>
 #include <libheif/heif.h>
 #include "chicle-heif-loader.h"
-#include "chicle-image-size.h"
+#include "chicle-util.h"
 
 #define BYTES_PER_PIXEL 4
 #define IMAGE_BUFFER_SIZE_MAX (0xffffffffU >> 2)

tools/chafa/chicle-image-size.h

@@ -25,8 +25,8 @@
 #include <jxl/resizable_parallel_runner.h>
 #include <stdio.h>
 
-#include "chicle-image-size.h"
 #include "chicle-jxl-loader.h"
+#include "chicle-util.h"
 
 #define IMAGE_BUFFER_SIZE_MAX (0xffffffffU >> 2)
 

tools/chafa/chicle-jxl-loader.c

@@ -173,6 +173,31 @@ chicle_rotate_image (gpointer *src, guint *width, guint *height, guint *rowstrid
     *rowstride = dest_rowstride;
 }
 
+gboolean
+chicle_checked_image_buffer_size (guint64 width, guint64 height, guint64 n_channels,
+                                  guint64 max_size, gsize *size_out)
+{
+    guint64 size;
+
+    if (width < 1 || height < 1 || n_channels < 1)
+        return FALSE;
+    if (width > G_MAXSIZE / height)
+        return FALSE;
+
+    size = width * height;
+    if (size > G_MAXSIZE / n_channels)
+        return FALSE;
+
+    size *= n_channels;
+    if (size > max_size)
+        return FALSE;
+
+    if (size_out)
+        *size_out = (gsize) size;
+
+    return TRUE;
+}
+
 /* Replaces control characters (C0: U+0000..U+001F, U+007F; C1:
  * U+0080..U+009F) with '?' so attacker-controlled input cannot inject
  * terminal escape sequences when this string is later printed to a

tools/chafa/chicle-util.c

@@ -45,6 +45,8 @@ ChicleRotationType;
 ChicleRotationType chicle_invert_rotation (ChicleRotationType rot);
 void chicle_rotate_image (gpointer *src, guint *width, guint *height, guint *rowstride,
                           guint n_channels, ChicleRotationType rot);
+gboolean chicle_checked_image_buffer_size (guint64 width, guint64 height, guint64 n_channels,
+                                           guint64 max_size, gsize *size_out);
 
 void chicle_flatten_cntrl_inplace (gchar *str);
 gchar *chicle_ellipsize_string (const gchar *str, gint len_max,

tools/chafa/chicle-util.h

@@ -32,7 +32,7 @@
 
 #include <chafa.h>
 #include "chicle-webp-loader.h"
-#include "chicle-image-size.h"
+#include "chicle-util.h"
 
 #define DEFAULT_FRAME_DURATION_MS 50
 #define BYTES_PER_PIXEL 4