bare-jpeg 1.1.5 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/binding.c CHANGED
@@ -1,5 +1,5 @@
1
1
  #include <assert.h>
2
- #include <bare.h>
2
+ #include <bare/module.h>
3
3
  #include <jpeglib.h>
4
4
  #include <js.h>
5
5
  #include <setjmp.h>
@@ -75,7 +75,7 @@ bare_jpeg_decode(js_env_t *env, js_callback_info_t *info) {
75
75
 
76
76
  if (decoder.out_color_space == JCS_GRAYSCALE) decoder.out_color_space = JCS_RGB;
77
77
 
78
- jpeg_start_decompress(&decoder);
78
+ jpeg_calc_output_dimensions(&decoder);
79
79
 
80
80
  JDIMENSION width = decoder.output_width;
81
81
  JDIMENSION height = decoder.output_height;
@@ -99,6 +99,8 @@ bare_jpeg_decode(js_env_t *env, js_callback_info_t *info) {
99
99
  return NULL;
100
100
  }
101
101
 
102
+ jpeg_start_decompress(&decoder);
103
+
102
104
  js_value_t *result;
103
105
  err = js_create_object(env, &result);
104
106
  assert(err == 0);
@@ -171,7 +173,8 @@ bare_jpeg_encode(js_env_t *env, js_callback_info_t *info) {
171
173
  assert(argc == 4);
172
174
 
173
175
  uint8_t *data;
174
- err = js_get_typedarray_info(env, argv[0], NULL, (void **) &data, NULL, NULL, NULL);
176
+ size_t data_len;
177
+ err = js_get_typedarray_info(env, argv[0], NULL, (void **) &data, &data_len, NULL, NULL);
175
178
  assert(err == 0);
176
179
 
177
180
  int64_t width;
@@ -193,6 +196,13 @@ bare_jpeg_encode(js_env_t *env, js_callback_info_t *info) {
193
196
  return NULL;
194
197
  }
195
198
 
199
+ if ((uint64_t) width * height * 4 > data_len) {
200
+ err = js_throw_error(env, NULL, "RGBA data is too short for the JPEG dimensions");
201
+ assert(err == 0);
202
+
203
+ return NULL;
204
+ }
205
+
196
206
  bare_jpeg_error_t error;
197
207
 
198
208
  struct jpeg_compress_struct encoder;
@@ -10,6 +10,11 @@ declare_port(
10
10
  "github:libjpeg-turbo/libjpeg-turbo#3.2.0"
11
11
  jpeg
12
12
  BYPRODUCTS ${lib}
13
+ ARGS
14
+ -DENABLE_SHARED=OFF
15
+ -DWITH_TESTS=OFF
16
+ -DWITH_TOOLS=OFF
17
+ -DWITH_TURBOJPEG=OFF
13
18
  )
14
19
 
15
20
  add_library(jpeg STATIC IMPORTED GLOBAL)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bare-jpeg",
3
- "version": "1.1.5",
3
+ "version": "1.2.0",
4
4
  "description": "JPEG support for Bare",
5
5
  "exports": {
6
6
  "./package": "./package.json",
@@ -32,7 +32,7 @@
32
32
  "homepage": "https://github.com/holepunchto/bare-jpeg#readme",
33
33
  "devDependencies": {
34
34
  "brittle": "^3.4.0",
35
- "cmake-bare": "^1.1.2",
35
+ "cmake-bare": "^1.10.1",
36
36
  "cmake-ports": "^1.5.9",
37
37
  "lunte": "^1.8.0",
38
38
  "prettier": "^3.3.3",
Binary file
Binary file
Binary file
Binary file