ttf2woff2 7.0.0 → 8.0.0

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# [8.0.0](https://github.com/nfroidure/ttf2woff2/compare/v7.0.0...v8.0.0) (2025-06-02)
+
+
+### Bug Fixes
+
+* **leak:** fix the error cas memory leak ([0896e18](https://github.com/nfroidure/ttf2woff2/commit/0896e183ee7f43d5f7cca5d4205557548dd86c71)), closes [#91](https://github.com/nfroidure/ttf2woff2/issues/91)
+
+
+
 # [7.0.0](https://github.com/nfroidure/ttf2woff2/compare/v6.0.1...v7.0.0) (2025-05-22)
 
 

package/csrc/addon.cc

@@ -31,7 +31,8 @@ NAN_METHOD(convert) {
     reinterpret_cast<const uint8_t*>(input_data), input_length,
     reinterpret_cast<uint8_t*>(output_data), &actual_output_length
   )) {
-    Nan::ThrowError(Nan::Error("Could not convert the given font."));
+    free(output_data);
+    Nan::ThrowError(Nan::Error("E_CONVERT_ERROR"));
     return;
   }
 

package/csrc/fallback.cc

@@ -22,16 +22,19 @@ int convert(int inputDataAddress, int inputLength, int outputSizePtrAddress) {
 
   uint8_t* outputData = reinterpret_cast<uint8_t*>(calloc(outputSize, sizeof(uint8_t)));
 
-
   if(!woff2::ConvertTTFToWOFF2(
     reinterpret_cast<const uint8_t*>(inputData),
     inputLength,
     outputData,
     &outputSize
   )) {
-    // throw an error
+    outputData = reinterpret_cast<uint8_t*>(realloc(outputData, 0));
+    *outputSizePtr = 0;
+    return reinterpret_cast<int>(outputData);
   }
 
+  outputData = reinterpret_cast<uint8_t*>(realloc(outputData, outputSize));
+
   *outputSizePtr = outputSize;
 
   return reinterpret_cast<int>(outputData);

package/dist/tests.test.js

@@ -1,5 +1,6 @@
 import { describe, test, expect, jest } from '@jest/globals';
 import { readFile } from 'node:fs/promises';
+import { YError } from 'yerror';
 describe('ttf2woff2', () => {
     test('should work from the main endpoint', async () => {
         jest.setTimeout(5000);
@@ -18,7 +19,18 @@ describe('ttf2woff2', () => {
         expect(outputContent[1071]).toEqual(0);
         expect(outputContent).toEqual(await readFile('fixtures/iconsfont.woff2'));
     });
-    test('should work from the emscripten endpoint', async () => {
+    test('should well fail from the native build', async () => {
+        const ttf2woff2 = (await import('bindings')).default('addon.node').convert;
+        const inputContent = Buffer.alloc(2 ** 32, 0xff);
+        try {
+            ttf2woff2(inputContent);
+            throw new YError('E_UNEXPECTED_SUCCESS');
+        }
+        catch (err) {
+            expect(err).toMatchInlineSnapshot(`[Error: E_CONVERT_ERROR]`);
+        }
+    });
+    test('should work from the Emscripten endpoint', async () => {
         jest.setTimeout(5000);
         const ttf2woff2 = (await import('../jssrc/index.js')).default;
         const inputContent = await readFile('fixtures/iconsfont.ttf');
@@ -27,5 +39,17 @@ describe('ttf2woff2', () => {
         expect(outputContent[1071]).toEqual(0);
         expect(outputContent).toEqual(await readFile('fixtures/iconsfont.woff2'));
     });
+    test('should well fail from the Emscripten build', async () => {
+        jest.setTimeout(5000);
+        const ttf2woff2 = (await import('../jssrc/index.js')).default;
+        const inputContent = Buffer.alloc(512, 0xff);
+        try {
+            ttf2woff2(inputContent);
+            throw new YError('E_UNEXPECTED_SUCCESS');
+        }
+        catch (err) {
+            expect(err).toMatchInlineSnapshot(`[YError: E_CONVERT_ERROR (): E_CONVERT_ERROR]`);
+        }
+    });
 });
 //# sourceMappingURL=tests.test.js.map

package/dist/tests.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"tests.test.js","sourceRoot":"","sources":["../src/tests.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,IAAI,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QACpD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtB,MAAM,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;QACvD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;QAE9C,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,MAAM,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;QAC3E,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;QAE9C,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,MAAM,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QAC1D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAEtB,MAAM,SAAS,GAAG,CAAC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC;QAC9D,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;QAE9C,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,MAAM,QAAQ,CAAC,0BAA0B,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"tests.test.js","sourceRoot":"","sources":["../src/tests.test.ts"],"names":[],"mappings":"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"}

package/jssrc/index.js

@@ -1,31 +1,39 @@
+import { YError } from 'yerror';
 import theTTFToWOFF2Module from './ttf2woff2.cjs';
 
 export default function ttf2woff2(inputContent) {
   // Prepare input
   const inputBuffer = theTTFToWOFF2Module._malloc(inputContent.length + 1);
-  const outputSizePtr = theTTFToWOFF2Module._malloc(4); // eslint-disable-line
+  const outputSizePtr = theTTFToWOFF2Module._malloc(4);
   let outputBufferPtr;
   let outputSize;
   let outputContent;
 
   theTTFToWOFF2Module.writeArrayToMemory(inputContent, inputBuffer);
 
-  // Run
-  outputBufferPtr = theTTFToWOFF2Module.convert(
-    inputBuffer,
-    inputContent.length,
-    outputSizePtr,
-  );
+  try {
+    // Run
+    outputBufferPtr = theTTFToWOFF2Module.convert(
+      inputBuffer,
+      inputContent.length,
+      outputSizePtr,
+    );
 
-  // Retrieve output
-  outputSize = theTTFToWOFF2Module.getValue(outputSizePtr, 'i32');
-  outputContent = Buffer.alloc(outputSize);
+    // Retrieve output
+    outputSize = theTTFToWOFF2Module.getValue(outputSizePtr, 'i32');
+    outputContent = Buffer.alloc(outputSize);
 
-  for (let i = 0; i < outputSize; i++) {
-    outputContent[i] = theTTFToWOFF2Module.getValue(outputBufferPtr + i, 'i8');
-  }
+    for (let i = 0; i < outputSize; i++) {
+      outputContent[i] = theTTFToWOFF2Module.getValue(outputBufferPtr + i, 'i8');
+    }
+
+    if (outputSize === 0) {
+      throw new YError('E_CONVERT_ERROR');
+    }
 
-  theTTFToWOFF2Module.freePtrs(outputBufferPtr, outputSizePtr);
+  } finally {
+    theTTFToWOFF2Module.freePtrs(outputBufferPtr, outputSizePtr);
+  }
 
   return outputContent;
 };

package/package.json

@@ -25,7 +25,7 @@
     }
   },
   "name": "ttf2woff2",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "description": "Convert TTF files to WOFF2 ones.",
   "main": "dist/index.js",
   "browser": "jssrc/index.js",
@@ -42,8 +42,8 @@
     "configure": "node-gyp configure",
     "cover": "npm run jest -- --coverage",
     "cz": "env NODE_ENV=${NODE_ENV:-cli} git cz",
-    "emcc": "miniquery -p \"targets.#.sources.#\" ./binding.gyp | grep -v \"csrc/addon.cc\" | xargs emcc --bind -o jssrc/ttf2woff2.cjs -O2 -s \"TOTAL_MEMORY=536870912\" -s \"ALLOW_MEMORY_GROWTH=1\" -s BINARYEN_ASYNC_COMPILATION=0 -s EXPORTED_FUNCTIONS=[\"_malloc\"] -s 'EXPORTED_RUNTIME_METHODS=[\"getValue\", \"writeArrayToMemory\"]' -s NODEJS_CATCH_EXIT=0 -s NODEJS_CATCH_REJECTION=0 --post-js jssrc/post.js csrc/fallback.cc",
-    "emcc-debug": "miniquery -p \"targets.#.sources.#\" ./binding.gyp | grep -v \"csrc/addon.cc\" | xargs emcc --bind -o jssrc/ttf2woff2.cjs -s \"ALLOW_MEMORY_GROWTH=1\" -s \"ASSERTIONS=1\" -s BINARYEN_ASYNC_COMPILATION=0 -s EXPORTED_FUNCTIONS=[\"_malloc\"] -s 'EXPORTED_RUNTIME_METHODS=[\"getValue\", \"writeArrayToMemory\"]' -s NODEJS_CATCH_EXIT=0 -s NODEJS_CATCH_REJECTION=0 --post-js jssrc/post.js csrc/fallback.cc",
+    "emcc": "miniquery -p \"targets.#.sources.#\" ./binding.gyp | grep -v \"csrc/addon.cc\" | xargs docker run --rm -v $(pwd):/src -u $(id -u):$(id -g) emscripten/emsdk emcc --bind -o jssrc/ttf2woff2.cjs -O2 -s \"TOTAL_MEMORY=536870912\" -s \"ALLOW_MEMORY_GROWTH=1\" -s BINARYEN_ASYNC_COMPILATION=0 -s EXPORTED_FUNCTIONS=[\"_malloc\"] -s 'EXPORTED_RUNTIME_METHODS=[\"getValue\", \"writeArrayToMemory\"]' -s NODEJS_CATCH_EXIT=0 -s NODEJS_CATCH_REJECTION=0 --post-js jssrc/post.js csrc/fallback.cc",
+    "emcc-debug": "miniquery -p \"targets.#.sources.#\" ./binding.gyp | grep -v \"csrc/addon.cc\" | xargs docker run --rm -v $(pwd):/src -u $(id -u):$(id -g) emscripten/emsdk emcc --bind -o jssrc/ttf2woff2.cjs -s \"ALLOW_MEMORY_GROWTH=1\" -s \"ASSERTIONS=1\" -s BINARYEN_ASYNC_COMPILATION=0 -s EXPORTED_FUNCTIONS=[\"_malloc\"] -s 'EXPORTED_RUNTIME_METHODS=[\"getValue\", \"writeArrayToMemory\"]' -s NODEJS_CATCH_EXIT=0 -s NODEJS_CATCH_REJECTION=0 --post-js jssrc/post.js csrc/fallback.cc",
     "format": "npm run prettier",
     "install": "((node-gyp configure && node-gyp build) > builderror.log) || (exit 0)",
     "jest": "NODE_OPTIONS=--experimental-vm-modules NODE_ENV=test jest",

package/src/tests.test.ts

@@ -1,5 +1,6 @@
 import { describe, test, expect, jest } from '@jest/globals';
 import { readFile } from 'node:fs/promises';
+import { YError } from 'yerror';
 
 describe('ttf2woff2', () => {
   test('should work from the main endpoint', async () => {
@@ -24,7 +25,19 @@ describe('ttf2woff2', () => {
     expect(outputContent).toEqual(await readFile('fixtures/iconsfont.woff2'));
   });
 
-  test('should work from the emscripten endpoint', async () => {
+  test('should well fail from the native build', async () => {
+    const ttf2woff2 = (await import('bindings')).default('addon.node').convert;
+    const inputContent = Buffer.alloc(2 ** 32, 0xff);
+
+    try {
+      ttf2woff2(inputContent);
+      throw new YError('E_UNEXPECTED_SUCCESS');
+    } catch (err) {
+      expect(err).toMatchInlineSnapshot(`[Error: E_CONVERT_ERROR]`);
+    }
+  });
+
+  test('should work from the Emscripten endpoint', async () => {
     jest.setTimeout(5000);
 
     const ttf2woff2 = (await import('../jssrc/index.js')).default;
@@ -35,4 +48,18 @@ describe('ttf2woff2', () => {
     expect(outputContent[1071]).toEqual(0);
     expect(outputContent).toEqual(await readFile('fixtures/iconsfont.woff2'));
   });
+
+  test('should well fail from the Emscripten build', async () => {
+    jest.setTimeout(5000);
+
+    const ttf2woff2 = (await import('../jssrc/index.js')).default;
+    const inputContent = Buffer.alloc(512, 0xff);
+
+    try {
+      ttf2woff2(inputContent);
+      throw new YError('E_UNEXPECTED_SUCCESS');
+    } catch (err) {
+      expect(err).toMatchInlineSnapshot(`[YError: E_CONVERT_ERROR (): E_CONVERT_ERROR]`);
+    }
+  });
 });