stb_image: fix: load invalid JPEGs #1608 (#37)

elixir-nx · Mar 17, 2024 · c69768e · c69768e
1 parent 0cb690c
commit c69768e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/3rd_party/stb/stb_image.h b/3rd_party/stb/stb_image.h
@@ -3437,7 +3437,7 @@ static int stbi__decode_jpeg_image(stbi__jpeg *j)
          if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG");
          m = stbi__get_marker(j);
       } else {
-         if (!stbi__process_marker(j, m)) return 1;
+         if (!stbi__process_marker(j, m)) return stbi__err("bad marker","Corrupt JPEG");
          m = stbi__get_marker(j);
       }
    }

diff --git a/test/stb-issue-1608.jpg b/test/stb-issue-1608.jpg
diff --git a/test/stb_image_test.exs b/test/stb_image_test.exs
@@ -261,4 +261,21 @@ defmodule StbImageTest do
       end
     end
   end
+
+  describe "bad files" do
+    test "JPEG with bad maker" do
+      file = Path.join(__DIR__, "stb-issue-1608.jpg")
+      binary = File.read!(file)
+
+      assert StbImage.read_file(file) == {:error, "cannot decode image"}
+      assert StbImage.read_binary(binary) == {:error, "cannot decode image"}
+
+      assert_raise ArgumentError, "cannot decode image", fn ->
+        StbImage.read_file!(file)
+      end
+      assert_raise ArgumentError, "cannot decode image", fn ->
+        StbImage.read_binary!(binary)
+      end
+    end
+  end
 end