Fixed the FPE issue reported in #166 and #167

Author: saitoha

Makefile.am

@@ -90,6 +90,18 @@ issue-165:
 issue-165-vexe:
 	tools/vexe --without-png ubuntu issue-165
 
+issue-166:
+	converters/img2sixel ../tests/issue/166/poc -w128 ; test $$? = 255 -o $$? = 127
+
+issue-166-vexe:
+	tools/vexe --platform=amd64 ubuntu issue-166
+
+issue-167:
+	converters/img2sixel ../tests/issue/167/poc -h128 ; test $$? = 255 -o $$? = 127
+
+issue-167-vexe:
+	tools/vexe --platform=amd64 ubuntu issue-167
+
 libsixel-libsixel-issue-73:
 	converters/img2sixel tests/issue/libsixel-libsixel/73/stbi_1561_poc.bin
 

Makefile.in

@@ -1007,6 +1007,18 @@ issue-165:
 issue-165-vexe:
 	tools/vexe --without-png ubuntu issue-165
 
+issue-166:
+	converters/img2sixel ../tests/issue/166/poc -w128 ; test $$? = 255 -o $$? = 127
+
+issue-166-vexe:
+	tools/vexe --platform=amd64 ubuntu issue-166
+
+issue-167:
+	converters/img2sixel ../tests/issue/167/poc -h128 ; test $$? = 255 -o $$? = 127
+
+issue-167-vexe:
+	tools/vexe --platform=amd64 ubuntu issue-167
+
 libsixel-libsixel-issue-73:
 	converters/img2sixel tests/issue/libsixel-libsixel/73/stbi_1561_poc.bin
 

converters/Makefile.am

@@ -89,7 +89,6 @@ if WANT_IMG2SIXEL
 	test ! $$($(WINE) $(builddir)/img2sixel$(WINEEXT) -I -p8 $(top_srcdir)/images/snake.png)
 	test ! $$($(WINE) $(builddir)/img2sixel$(WINEEXT) -p64 -bxterm256 $(top_srcdir)/images/snake.png)
 	test ! $$($(WINE) $(builddir)/img2sixel$(WINEEXT) -8 -P $(top_srcdir)/images/snake.png)
-	$(WINE) $(builddir)/img2sixel$(WINEEXT) -B "#000" -B ""; test $$? = 255 -o $$? = 127
 
 	@echo '[test2] STDIN handling'
 	test ! $$(echo -n a | $(WINE) $(builddir)/img2sixel$(WINEEXT))
@@ -273,8 +272,12 @@ if WANT_SIXEL2PNG
 	$(WINE) $(builddir)/sixel2png$(WINEEXT) - - < $(builddir)/tmp/snake3.sixel > $(builddir)/tmp/snake3.png
 	$(WINE) $(builddir)/sixel2png$(WINEEXT) -i $(builddir)/tmp/snake.sixel -o $(builddir)/tmp/snake4.png
 endif
+	@echo '[test13] regression test'
+	$(WINE) $(builddir)/img2sixel$(WINEEXT) -B "#000" -B ""; test $$? = 255 -o $$? = 127
+	$(WINE) $(builddir)/img2sixel$(WINEEXT) ../tests/issue/167/poc -h128 ; test $$? = 255 -o $$? = 127
+	$(WINE) $(builddir)/img2sixel$(WINEEXT) ../tests/issue/166/poc -w128 ; test $$? = 255 -o $$? = 127
 
-	@echo '[test13] documentation'
+	@echo '[test14] documentation'
 	$(WINE) $(builddir)/img2sixel$(WINEEXT) -H| grep ^\ \*\-|sed 's/^\ *//'| cut -f1 -d' '| cut -f1 -d, > $(builddir)/tmp/options1.txt
 	grep ^\.B $(srcdir)/img2sixel.1  | cut -f2 -d " " | grep "^\\\\" | tr -d '\\' | tr -d , > $(builddir)/tmp/options2.txt
 	grep ' --' $(srcdir)/shell-completion/bash/img2sixel| grep -v "' "| sed 's/.* \(-.\) .*/\1/' > $(builddir)/tmp/options3.txt

converters/Makefile.in

@@ -1079,7 +1079,6 @@ test_impl:
 @WANT_IMG2SIXEL_TRUE@	test ! $$($(WINE) $(builddir)/img2sixel$(WINEEXT) -I -p8 $(top_srcdir)/images/snake.png)
 @WANT_IMG2SIXEL_TRUE@	test ! $$($(WINE) $(builddir)/img2sixel$(WINEEXT) -p64 -bxterm256 $(top_srcdir)/images/snake.png)
 @WANT_IMG2SIXEL_TRUE@	test ! $$($(WINE) $(builddir)/img2sixel$(WINEEXT) -8 -P $(top_srcdir)/images/snake.png)
-@WANT_IMG2SIXEL_TRUE@	$(WINE) $(builddir)/img2sixel$(WINEEXT) -B "#000" -B ""; test $$? = 255 -o $$? = 127
 
 @WANT_IMG2SIXEL_TRUE@	@echo '[test2] STDIN handling'
 @WANT_IMG2SIXEL_TRUE@	test ! $$(echo -n a | $(WINE) $(builddir)/img2sixel$(WINEEXT))
@@ -1257,8 +1256,12 @@ test_impl:
 @WANT_IMG2SIXEL_TRUE@@WANT_SIXEL2PNG_TRUE@	$(WINE) $(builddir)/sixel2png$(WINEEXT) < $(builddir)/tmp/snake2.sixel > $(builddir)/tmp/snake2.png
 @WANT_IMG2SIXEL_TRUE@@WANT_SIXEL2PNG_TRUE@	$(WINE) $(builddir)/sixel2png$(WINEEXT) - - < $(builddir)/tmp/snake3.sixel > $(builddir)/tmp/snake3.png
 @WANT_IMG2SIXEL_TRUE@@WANT_SIXEL2PNG_TRUE@	$(WINE) $(builddir)/sixel2png$(WINEEXT) -i $(builddir)/tmp/snake.sixel -o $(builddir)/tmp/snake4.png
+@WANT_IMG2SIXEL_TRUE@	@echo '[test13] regression test'
+@WANT_IMG2SIXEL_TRUE@	$(WINE) $(builddir)/img2sixel$(WINEEXT) -B "#000" -B ""; test $$? = 255 -o $$? = 127
+@WANT_IMG2SIXEL_TRUE@	$(WINE) $(builddir)/img2sixel$(WINEEXT) ../tests/issue/167/poc -h128 ; test $$? = 255 -o $$? = 127
+@WANT_IMG2SIXEL_TRUE@	$(WINE) $(builddir)/img2sixel$(WINEEXT) ../tests/issue/166/poc -w128 ; test $$? = 255 -o $$? = 127
 
-@WANT_IMG2SIXEL_TRUE@	@echo '[test13] documentation'
+@WANT_IMG2SIXEL_TRUE@	@echo '[test14] documentation'
 @WANT_IMG2SIXEL_TRUE@	$(WINE) $(builddir)/img2sixel$(WINEEXT) -H| grep ^\ \*\-|sed 's/^\ *//'| cut -f1 -d' '| cut -f1 -d, > $(builddir)/tmp/options1.txt
 @WANT_IMG2SIXEL_TRUE@	grep ^\.B $(srcdir)/img2sixel.1  | cut -f2 -d " " | grep "^\\\\" | tr -d '\\' | tr -d , > $(builddir)/tmp/options2.txt
 @WANT_IMG2SIXEL_TRUE@	grep ' --' $(srcdir)/shell-completion/bash/img2sixel| grep -v "' "| sed 's/.* \(-.\) .*/\1/' > $(builddir)/tmp/options3.txt

src/encoder.c

@@ -621,6 +621,20 @@ sixel_encoder_do_resize(
     src_width = sixel_frame_get_width(frame);
     src_height = sixel_frame_get_height(frame);
 
+    if (src_width < 1) {
+         sixel_helper_set_additional_message(
+             "sixel_encoder_do_resize: "
+             "detected a frame with a non-positive width.");
+        return SIXEL_BAD_ARGUMENT;
+    }
+
+    if (src_height < 1) {
+         sixel_helper_set_additional_message(
+             "sixel_encoder_do_resize: "
+             "detected a frame with a non-positive height.");
+        return SIXEL_BAD_ARGUMENT;
+    }
+
     /* settings around scaling */
     dst_width = encoder->pixelwidth;    /* may be -1 (default) */
     dst_height = encoder->pixelheight;  /* may be -1 (default) */

tools/vexe

@@ -43,7 +43,7 @@ while getopts h-: opt; do
             pp__force_disable_src_cache=1
             ;;
         -p|--platform)
-            opt__platform="${optarg}"
+            opt__platform="${optarg#=}"
             ;;
         --require-valgrind)
             pp__valgrind=1
@@ -96,7 +96,7 @@ cd "$(git rev-parse --show-toplevel || dirname "${0}")" && {
 
 # make distclean || :
 
-: "${dockeropt__platform:="${opt__platform:+linux/"${opt__platform}"}"}"
+: "${dockeropt__platform:="--platform ${opt__platform:+linux/"${opt__platform}"}"}"
 
 # workaround: We cannot find multi-arch slackware...
 : "${pp__os_slackware+:+"${dockeropt__platform:="--platform linux/amd64"}"}"