@corbet-labs/cink 0.1.2 → 0.1.4

package/LICENSES/Apache-2.0.txt

@@ -0,0 +1,204 @@
+Copyright 2026 Julian Y. Richard Corbet
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -2,7 +2,7 @@
 
 **Prepare handwritten signature images for correspondence.**
 
-[![crates.io](https://img.shields.io/crates/v/cink.svg)](https://crates.io/crates/cink) [![npm](https://img.shields.io/npm/v/@corbet-labs/cink.svg)](https://www.npmjs.com/package/@corbet-labs/cink) [![Rust API](https://docs.rs/cink/badge.svg)](https://docs.rs/cink) [![CI](https://github.com/corbet-labs/cink/actions/workflows/ci.yml/badge.svg)](https://github.com/corbet-labs/cink/actions/workflows/ci.yml)
+[![crates.io](https://img.shields.io/crates/v/cink.svg)](https://crates.io/crates/cink) [![npm](https://img.shields.io/npm/v/@corbet-labs/cink.svg)](https://www.npmjs.com/package/@corbet-labs/cink) [![Rust API](https://docs.rs/cink/badge.svg)](https://docs.rs/cink)
 
 Recognize PNG, JPEG, and SVG input, inspect raster dimensions, calculate an aspect-preserving size, and generate a Typst image call. Runs without an image-decoding library.
 
@@ -24,7 +24,7 @@ imageSnippet('/signature.png', 31.5);
 | Bun | `bun add @corbet-labs/cink` |
 | Deno | `deno add npm:@corbet-labs/cink` |
 
-The 0.1.2 JavaScript distribution includes compiled ESM, CommonJS,
+The 0.1.4 JavaScript distribution includes compiled ESM, CommonJS,
 TypeScript declarations, and a standalone browser module. Node.js 20+ is
 supported; no TypeScript loader is required.
 
@@ -35,7 +35,7 @@ const { imageSnippet } = require('@corbet-labs/cink');
 
 ```html
 <script type="module">
-  import { imageSnippet } from 'https://cdn.jsdelivr.net/npm/@corbet-labs/cink@0.1.2/dist/browser.js';
+  import { imageSnippet } from 'https://cdn.jsdelivr.net/npm/@corbet-labs/cink@0.1.4/dist/browser.js';
   console.log(imageSnippet('/signature.png', 31.5));
 </script>
 ```
@@ -70,7 +70,9 @@ assert image_snippet("/signature.png", 31.5) == '#image("/signature.png", height
 | `signatureSize` / `signature_size` | Fit dimensions to a point size |
 | `imageSnippet` / `image_snippet` | Generate a Typst image call |
 
-PNG and JPEG dimensions are read from headers; this is not a full raster integrity check. SVG passes through without sanitization or known dimensions. Unrecognized headers and unsupported formats return `null`/`None`. Resampling and placement belong to the caller. These are handwriting images, not cryptographic or electronic signatures.
+Base64 input uses the standard alphabet, required padding, and canonical trailing bits; embedded whitespace is rejected.
+
+PNG and JPEG dimensions are read from headers; this is not a full raster integrity check. SVG passes through without sanitization or known dimensions. Unrecognized headers and unsupported formats return `null`/`None`. Nonpositive, nonfinite, and unrepresentable requested sizes return `null`/`None`. Resampling and placement belong to the caller. These are handwriting images, not cryptographic or electronic signatures.
 
 ## Correspondence family
 
@@ -87,13 +89,15 @@ PNG and JPEG dimensions are read from headers; this is not a full raster integri
 
 Behavior is defined by [the locale tables](https://github.com/corbet-labs/cink/tree/main/tables)
 and [shared conformance vectors](https://github.com/corbet-labs/cink/tree/main/tests/vectors).
-Rust, JavaScript, and Python run the same vectors. CI also exercises installed
-JavaScript tarballs across package managers and operating systems, and tests
-Python wheels outside their source package.
+Rust, JavaScript, and Python run the same vectors. Selected CI checks exercise
+installed JavaScript tarballs, Python wheels and command-line entrypoints, and
+Typst packages. Release validation records the actual runtime and platform;
+Linux results do not establish native Windows or macOS coverage.
+All five Rust crates forbid unsafe code in their own source.
 
 See [the release guide](https://github.com/corbet-labs/cink/blob/main/docs/releasing.md)
 for generation, verification, and publication commands.
 
 ## License
 
-FSL-1.1-ALv2. Each release becomes available under Apache-2.0 two years after publication. See [the full license](https://github.com/corbet-labs/cink/blob/main/LICENSES/FSL-1.1-ALv2.txt) for permitted use.
+Copyright 2026 Julian Y. Richard Corbet. cink 0.1.4 is licensed under [Apache-2.0](https://github.com/corbet-labs/cink/blob/main/LICENSES/Apache-2.0.txt). Previously published versions retain their original license grants.

package/dist/browser.js

@@ -11,7 +11,7 @@ function supportedFormats() {
 }
 var PNG_MAGIC = [137, 80, 78, 71, 13, 10, 26, 10];
 function pngDimensions(bytes) {
-  if (bytes.length < 24)
+  if (bytes.length < 33)
     return null;
   for (let i = 0;i < 8; i++)
     if (bytes[i] !== PNG_MAGIC[i])
@@ -23,7 +23,12 @@ function pngDimensions(bytes) {
     return null;
   const width = view.getUint32(16);
   const height = view.getUint32(20);
-  if (width === 0 || height === 0)
+  if (width === 0 || height === 0 || width > 2147483647 || height > 2147483647)
+    return null;
+  const depth = bytes[24];
+  const color = bytes[25];
+  const validDepth = color === 0 ? [1, 2, 4, 8, 16].includes(depth) : color === 3 ? [1, 2, 4, 8].includes(depth) : [2, 4, 6].includes(color) && [8, 16].includes(depth);
+  if (!validDepth || bytes[26] !== 0 || bytes[27] !== 0 || bytes[28] > 1)
     return null;
   return [width, height];
 }
@@ -48,14 +53,28 @@ function jpegDimensions(bytes) {
   const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
   let pos = 2;
   while (pos < bytes.length) {
+    if (bytes[pos] !== 255)
+      return null;
     while (pos < bytes.length && bytes[pos] === 255)
       pos++;
     if (pos >= bytes.length)
       return null;
     const marker = bytes[pos];
     pos++;
+    if (marker === 1)
+      continue;
+    if (marker === 0 || marker >= 208 && marker <= 218)
+      return null;
+    if (pos + 2 > bytes.length)
+      return null;
+    const len = view.getUint16(pos);
+    if (len < 2 || len > bytes.length - pos)
+      return null;
     if (SOF_MARKERS.has(marker)) {
-      if (pos + 7 > bytes.length)
+      if (len < 8)
+        return null;
+      const components = bytes[pos + 7];
+      if (components === 0 || len !== 8 + 3 * components)
         return null;
       const height = view.getUint16(pos + 3);
       const width = view.getUint16(pos + 5);
@@ -63,15 +82,6 @@ function jpegDimensions(bytes) {
         return null;
       return [width, height];
     }
-    if (marker === 217 || marker === 218)
-      return null;
-    if (marker === 0 || marker === 1 || marker >= 208 && marker <= 215)
-      continue;
-    if (pos + 2 > bytes.length)
-      return null;
-    const len = view.getUint16(pos);
-    if (len < 2)
-      return null;
     pos += len;
   }
   return null;
@@ -90,7 +100,7 @@ function sniff(bytes) {
     return { mime: "jpeg", width: dims[0], height: dims[1], bytes };
   }
   let start = 0;
-  while (start < bytes.length && /\s/.test(String.fromCharCode(bytes[start])))
+  while (start < bytes.length && [9, 10, 12, 13, 32].includes(bytes[start]))
     start++;
   const head = String.fromCharCode(...bytes.slice(start, start + 4));
   if (head === "<svg")
@@ -102,6 +112,8 @@ function decodeBase64(payload) {
     return null;
   try {
     const text = atob(payload);
+    if (btoa(text) !== payload)
+      return null;
     const bytes = new Uint8Array(text.length);
     for (let i = 0;i < text.length; i++)
       bytes[i] = text.charCodeAt(i);
@@ -115,7 +127,7 @@ function normalize(input) {
   const comma = input.indexOf(",");
   if (comma >= 0 && input.startsWith("data:")) {
     const meta = input.slice(0, comma);
-    if (!meta.includes(";base64"))
+    if (!meta.endsWith(";base64"))
       return null;
     payload = input.slice(comma + 1);
   }
@@ -138,17 +150,33 @@ function scaleToFit(image, maxPixels) {
   return Math.sqrt(maxPixels / pixels);
 }
 function signatureSize(image, heightPt, maxWidthPt) {
-  if (image.width === null || image.height === null)
+  if (image.width === null || image.height === null || !Number.isInteger(image.width) || !Number.isInteger(image.height) || image.width <= 0 || image.height <= 0 || image.width > 4294967295 || image.height > 4294967295 || !Number.isFinite(heightPt) || heightPt <= 0 || maxWidthPt !== undefined && (!Number.isFinite(maxWidthPt) || maxWidthPt <= 0))
     return null;
-  const natural = heightPt * image.width / image.height;
+  const ratio = image.width / image.height;
+  const natural = heightPt * ratio;
+  let width = natural;
+  let height = heightPt;
   if (maxWidthPt !== undefined && natural > maxWidthPt) {
-    const scale = maxWidthPt / natural;
-    return [maxWidthPt, heightPt * scale];
+    width = maxWidthPt;
+    height = maxWidthPt / ratio;
   }
-  return [natural, heightPt];
+  return Number.isFinite(width) && Number.isFinite(height) && width > 0 && height > 0 ? [width, height] : null;
 }
 function escapePath(path) {
-  return path.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+  return path.replace(/["\\\u0000-\u001f\u007f-\u009f]/g, (character) => {
+    if (character === '"')
+      return "\\\"";
+    if (character === "\\")
+      return "\\\\";
+    if (character === `
+`)
+      return "\\n";
+    if (character === "\r")
+      return "\\r";
+    if (character === "\t")
+      return "\\t";
+    return `\\u{${character.charCodeAt(0).toString(16)}}`;
+  });
 }
 function imageSnippet(path, heightPt, widthPt) {
   const safe = escapePath(path);

package/dist/index.cjs

@@ -62,7 +62,7 @@ function supportedFormats() {
 }
 var PNG_MAGIC = [137, 80, 78, 71, 13, 10, 26, 10];
 function pngDimensions(bytes) {
-  if (bytes.length < 24)
+  if (bytes.length < 33)
     return null;
   for (let i = 0;i < 8; i++)
     if (bytes[i] !== PNG_MAGIC[i])
@@ -74,7 +74,12 @@ function pngDimensions(bytes) {
     return null;
   const width = view.getUint32(16);
   const height = view.getUint32(20);
-  if (width === 0 || height === 0)
+  if (width === 0 || height === 0 || width > 2147483647 || height > 2147483647)
+    return null;
+  const depth = bytes[24];
+  const color = bytes[25];
+  const validDepth = color === 0 ? [1, 2, 4, 8, 16].includes(depth) : color === 3 ? [1, 2, 4, 8].includes(depth) : [2, 4, 6].includes(color) && [8, 16].includes(depth);
+  if (!validDepth || bytes[26] !== 0 || bytes[27] !== 0 || bytes[28] > 1)
     return null;
   return [width, height];
 }
@@ -99,14 +104,28 @@ function jpegDimensions(bytes) {
   const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
   let pos = 2;
   while (pos < bytes.length) {
+    if (bytes[pos] !== 255)
+      return null;
     while (pos < bytes.length && bytes[pos] === 255)
       pos++;
     if (pos >= bytes.length)
       return null;
     const marker = bytes[pos];
     pos++;
+    if (marker === 1)
+      continue;
+    if (marker === 0 || marker >= 208 && marker <= 218)
+      return null;
+    if (pos + 2 > bytes.length)
+      return null;
+    const len = view.getUint16(pos);
+    if (len < 2 || len > bytes.length - pos)
+      return null;
     if (SOF_MARKERS.has(marker)) {
-      if (pos + 7 > bytes.length)
+      if (len < 8)
+        return null;
+      const components = bytes[pos + 7];
+      if (components === 0 || len !== 8 + 3 * components)
         return null;
       const height = view.getUint16(pos + 3);
       const width = view.getUint16(pos + 5);
@@ -114,15 +133,6 @@ function jpegDimensions(bytes) {
         return null;
       return [width, height];
     }
-    if (marker === 217 || marker === 218)
-      return null;
-    if (marker === 0 || marker === 1 || marker >= 208 && marker <= 215)
-      continue;
-    if (pos + 2 > bytes.length)
-      return null;
-    const len = view.getUint16(pos);
-    if (len < 2)
-      return null;
     pos += len;
   }
   return null;
@@ -141,7 +151,7 @@ function sniff(bytes) {
     return { mime: "jpeg", width: dims[0], height: dims[1], bytes };
   }
   let start = 0;
-  while (start < bytes.length && /\s/.test(String.fromCharCode(bytes[start])))
+  while (start < bytes.length && [9, 10, 12, 13, 32].includes(bytes[start]))
     start++;
   const head = String.fromCharCode(...bytes.slice(start, start + 4));
   if (head === "<svg")
@@ -153,6 +163,8 @@ function decodeBase64(payload) {
     return null;
   try {
     const text = atob(payload);
+    if (btoa(text) !== payload)
+      return null;
     const bytes = new Uint8Array(text.length);
     for (let i = 0;i < text.length; i++)
       bytes[i] = text.charCodeAt(i);
@@ -166,7 +178,7 @@ function normalize(input) {
   const comma = input.indexOf(",");
   if (comma >= 0 && input.startsWith("data:")) {
     const meta = input.slice(0, comma);
-    if (!meta.includes(";base64"))
+    if (!meta.endsWith(";base64"))
       return null;
     payload = input.slice(comma + 1);
   }
@@ -189,17 +201,33 @@ function scaleToFit(image, maxPixels) {
   return Math.sqrt(maxPixels / pixels);
 }
 function signatureSize(image, heightPt, maxWidthPt) {
-  if (image.width === null || image.height === null)
+  if (image.width === null || image.height === null || !Number.isInteger(image.width) || !Number.isInteger(image.height) || image.width <= 0 || image.height <= 0 || image.width > 4294967295 || image.height > 4294967295 || !Number.isFinite(heightPt) || heightPt <= 0 || maxWidthPt !== undefined && (!Number.isFinite(maxWidthPt) || maxWidthPt <= 0))
     return null;
-  const natural = heightPt * image.width / image.height;
+  const ratio = image.width / image.height;
+  const natural = heightPt * ratio;
+  let width = natural;
+  let height = heightPt;
   if (maxWidthPt !== undefined && natural > maxWidthPt) {
-    const scale = maxWidthPt / natural;
-    return [maxWidthPt, heightPt * scale];
+    width = maxWidthPt;
+    height = maxWidthPt / ratio;
   }
-  return [natural, heightPt];
+  return Number.isFinite(width) && Number.isFinite(height) && width > 0 && height > 0 ? [width, height] : null;
 }
 function escapePath(path) {
-  return path.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+  return path.replace(/["\\\u0000-\u001f\u007f-\u009f]/g, (character) => {
+    if (character === '"')
+      return "\\\"";
+    if (character === "\\")
+      return "\\\\";
+    if (character === `
+`)
+      return "\\n";
+    if (character === "\r")
+      return "\\r";
+    if (character === "\t")
+      return "\\t";
+    return `\\u{${character.charCodeAt(0).toString(16)}}`;
+  });
 }
 function imageSnippet(path, heightPt, widthPt) {
   const safe = escapePath(path);

package/dist/index.js

@@ -11,7 +11,7 @@ function supportedFormats() {
 }
 var PNG_MAGIC = [137, 80, 78, 71, 13, 10, 26, 10];
 function pngDimensions(bytes) {
-  if (bytes.length < 24)
+  if (bytes.length < 33)
     return null;
   for (let i = 0;i < 8; i++)
     if (bytes[i] !== PNG_MAGIC[i])
@@ -23,7 +23,12 @@ function pngDimensions(bytes) {
     return null;
   const width = view.getUint32(16);
   const height = view.getUint32(20);
-  if (width === 0 || height === 0)
+  if (width === 0 || height === 0 || width > 2147483647 || height > 2147483647)
+    return null;
+  const depth = bytes[24];
+  const color = bytes[25];
+  const validDepth = color === 0 ? [1, 2, 4, 8, 16].includes(depth) : color === 3 ? [1, 2, 4, 8].includes(depth) : [2, 4, 6].includes(color) && [8, 16].includes(depth);
+  if (!validDepth || bytes[26] !== 0 || bytes[27] !== 0 || bytes[28] > 1)
     return null;
   return [width, height];
 }
@@ -48,14 +53,28 @@ function jpegDimensions(bytes) {
   const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
   let pos = 2;
   while (pos < bytes.length) {
+    if (bytes[pos] !== 255)
+      return null;
     while (pos < bytes.length && bytes[pos] === 255)
       pos++;
     if (pos >= bytes.length)
       return null;
     const marker = bytes[pos];
     pos++;
+    if (marker === 1)
+      continue;
+    if (marker === 0 || marker >= 208 && marker <= 218)
+      return null;
+    if (pos + 2 > bytes.length)
+      return null;
+    const len = view.getUint16(pos);
+    if (len < 2 || len > bytes.length - pos)
+      return null;
     if (SOF_MARKERS.has(marker)) {
-      if (pos + 7 > bytes.length)
+      if (len < 8)
+        return null;
+      const components = bytes[pos + 7];
+      if (components === 0 || len !== 8 + 3 * components)
         return null;
       const height = view.getUint16(pos + 3);
       const width = view.getUint16(pos + 5);
@@ -63,15 +82,6 @@ function jpegDimensions(bytes) {
         return null;
       return [width, height];
     }
-    if (marker === 217 || marker === 218)
-      return null;
-    if (marker === 0 || marker === 1 || marker >= 208 && marker <= 215)
-      continue;
-    if (pos + 2 > bytes.length)
-      return null;
-    const len = view.getUint16(pos);
-    if (len < 2)
-      return null;
     pos += len;
   }
   return null;
@@ -90,7 +100,7 @@ function sniff(bytes) {
     return { mime: "jpeg", width: dims[0], height: dims[1], bytes };
   }
   let start = 0;
-  while (start < bytes.length && /\s/.test(String.fromCharCode(bytes[start])))
+  while (start < bytes.length && [9, 10, 12, 13, 32].includes(bytes[start]))
     start++;
   const head = String.fromCharCode(...bytes.slice(start, start + 4));
   if (head === "<svg")
@@ -102,6 +112,8 @@ function decodeBase64(payload) {
     return null;
   try {
     const text = atob(payload);
+    if (btoa(text) !== payload)
+      return null;
     const bytes = new Uint8Array(text.length);
     for (let i = 0;i < text.length; i++)
       bytes[i] = text.charCodeAt(i);
@@ -115,7 +127,7 @@ function normalize(input) {
   const comma = input.indexOf(",");
   if (comma >= 0 && input.startsWith("data:")) {
     const meta = input.slice(0, comma);
-    if (!meta.includes(";base64"))
+    if (!meta.endsWith(";base64"))
       return null;
     payload = input.slice(comma + 1);
   }
@@ -138,17 +150,33 @@ function scaleToFit(image, maxPixels) {
   return Math.sqrt(maxPixels / pixels);
 }
 function signatureSize(image, heightPt, maxWidthPt) {
-  if (image.width === null || image.height === null)
+  if (image.width === null || image.height === null || !Number.isInteger(image.width) || !Number.isInteger(image.height) || image.width <= 0 || image.height <= 0 || image.width > 4294967295 || image.height > 4294967295 || !Number.isFinite(heightPt) || heightPt <= 0 || maxWidthPt !== undefined && (!Number.isFinite(maxWidthPt) || maxWidthPt <= 0))
     return null;
-  const natural = heightPt * image.width / image.height;
+  const ratio = image.width / image.height;
+  const natural = heightPt * ratio;
+  let width = natural;
+  let height = heightPt;
   if (maxWidthPt !== undefined && natural > maxWidthPt) {
-    const scale = maxWidthPt / natural;
-    return [maxWidthPt, heightPt * scale];
+    width = maxWidthPt;
+    height = maxWidthPt / ratio;
   }
-  return [natural, heightPt];
+  return Number.isFinite(width) && Number.isFinite(height) && width > 0 && height > 0 ? [width, height] : null;
 }
 function escapePath(path) {
-  return path.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+  return path.replace(/["\\\u0000-\u001f\u007f-\u009f]/g, (character) => {
+    if (character === '"')
+      return "\\\"";
+    if (character === "\\")
+      return "\\\\";
+    if (character === `
+`)
+      return "\\n";
+    if (character === "\r")
+      return "\\r";
+    if (character === "\t")
+      return "\\t";
+    return `\\u{${character.charCodeAt(0).toString(16)}}`;
+  });
 }
 function imageSnippet(path, heightPt, widthPt) {
   const safe = escapePath(path);

package/dist/types/index.d.cts

@@ -14,7 +14,8 @@ export declare function defaultMaxPixels(): number;
 /** Accepted image formats, from `tables/defaults.json`. */
 export declare function supportedFormats(): string[];
 /**
- * Validate a signature image given as a `data:` URL or raw base64.
+ * Recognize a signature image given as a `data:` URL or raw canonical base64.
+ * Required padding must be present; whitespace and nonzero unused bits are rejected.
  * Returns `null` for empty, undecodable, corrupt, or unsupported inputs.
  */
 export declare function normalize(input: string): DecodedImage | null;
@@ -30,8 +31,8 @@ export declare function exceedsLimits(image: DecodedImage, maxPixels: number): b
 export declare function scaleToFit(image: DecodedImage, maxPixels: number): number;
 /**
  * Point size for a target height, preserving aspect ratio, clamped to an
- * optional maximum width. Returns `null` when the image carries no
- * dimensions: the caller must size it.
+ * optional maximum width. Returns `null` for missing or invalid dimensions,
+ * nonpositive/nonfinite point sizes, or a nonrepresentable result.
  */
 export declare function signatureSize(image: DecodedImage, heightPt: number, maxWidthPt?: number): [number, number] | null;
 /**

package/dist/types/index.d.ts

@@ -14,7 +14,8 @@ export declare function defaultMaxPixels(): number;
 /** Accepted image formats, from `tables/defaults.json`. */
 export declare function supportedFormats(): string[];
 /**
- * Validate a signature image given as a `data:` URL or raw base64.
+ * Recognize a signature image given as a `data:` URL or raw canonical base64.
+ * Required padding must be present; whitespace and nonzero unused bits are rejected.
  * Returns `null` for empty, undecodable, corrupt, or unsupported inputs.
  */
 export declare function normalize(input: string): DecodedImage | null;
@@ -30,8 +31,8 @@ export declare function exceedsLimits(image: DecodedImage, maxPixels: number): b
 export declare function scaleToFit(image: DecodedImage, maxPixels: number): number;
 /**
  * Point size for a target height, preserving aspect ratio, clamped to an
- * optional maximum width. Returns `null` when the image carries no
- * dimensions: the caller must size it.
+ * optional maximum width. Returns `null` for missing or invalid dimensions,
+ * nonpositive/nonfinite point sizes, or a nonrepresentable result.
  */
 export declare function signatureSize(image: DecodedImage, heightPt: number, maxWidthPt?: number): [number, number] | null;
 /**

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@corbet-labs/cink",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Handwritten signature image rendering for correspondence. Pixels, not signatures. Mirrors the cink Rust crate release line.",
-  "license": "FSL-1.1-ALv2",
+  "license": "Apache-2.0",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/generated/tables.ts

@@ -1,3 +1,3 @@
 // GENERATED by scripts/sync-assets.sh — do not edit.
-export const PACKAGE_VERSION: string = "0.1.2";
+export const PACKAGE_VERSION: string = "0.1.4";
 export const DEFAULTS: unknown = {"max_pixels": 1600, "formats": ["png", "jpeg", "svg"]};

package/src/index.ts

@@ -40,14 +40,20 @@ export function supportedFormats(): string[] {
 const PNG_MAGIC = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
 
 function pngDimensions(bytes: Uint8Array): [number, number] | null {
-    if (bytes.length < 24) return null;
+    if (bytes.length < 33) return null;
     for (let i = 0; i < 8; i++) if (bytes[i] !== PNG_MAGIC[i]) return null;
     const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
     if (view.getUint32(8) !== 13) return null;
     if (view.getUint32(12) !== 0x49484452) return null;
     const width = view.getUint32(16);
     const height = view.getUint32(20);
-    if (width === 0 || height === 0) return null;
+    if (width === 0 || height === 0 || width > 0x7fffffff || height > 0x7fffffff) return null;
+    const depth = bytes[24];
+    const color = bytes[25];
+    const validDepth = color === 0 ? [1, 2, 4, 8, 16].includes(depth)
+        : color === 3 ? [1, 2, 4, 8].includes(depth)
+        : [2, 4, 6].includes(color) && [8, 16].includes(depth);
+    if (!validDepth || bytes[26] !== 0 || bytes[27] !== 0 || bytes[28] > 1) return null;
     return [width, height];
 }
 
@@ -60,22 +66,25 @@ function jpegDimensions(bytes: Uint8Array): [number, number] | null {
     const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
     let pos = 2;
     while (pos < bytes.length) {
+        if (bytes[pos] !== 0xff) return null;
         while (pos < bytes.length && bytes[pos] === 0xff) pos++;
         if (pos >= bytes.length) return null;
         const marker = bytes[pos];
         pos++;
+        if (marker === 0x01) continue;
+        if (marker === 0x00 || (marker >= 0xd0 && marker <= 0xda)) return null;
+        if (pos + 2 > bytes.length) return null;
+        const len = view.getUint16(pos);
+        if (len < 2 || len > bytes.length - pos) return null;
         if (SOF_MARKERS.has(marker)) {
-            if (pos + 7 > bytes.length) return null;
+            if (len < 8) return null;
+            const components = bytes[pos + 7];
+            if (components === 0 || len !== 8 + 3 * components) return null;
             const height = view.getUint16(pos + 3);
             const width = view.getUint16(pos + 5);
             if (width === 0 || height === 0) return null;
             return [width, height];
         }
-        if (marker === 0xd9 || marker === 0xda) return null;
-        if (marker === 0x00 || marker === 0x01 || (marker >= 0xd0 && marker <= 0xd7)) continue;
-        if (pos + 2 > bytes.length) return null;
-        const len = view.getUint16(pos);
-        if (len < 2) return null;
         pos += len;
     }
     return null;
@@ -93,7 +102,7 @@ function sniff(bytes: Uint8Array): DecodedImage | null {
         return { mime: 'jpeg', width: dims[0], height: dims[1], bytes };
     }
     let start = 0;
-    while (start < bytes.length && /\s/.test(String.fromCharCode(bytes[start]))) start++;
+    while (start < bytes.length && [9, 10, 12, 13, 32].includes(bytes[start])) start++;
     const head = String.fromCharCode(...bytes.slice(start, start + 4));
     if (head === '<svg') return { mime: 'svg', width: null, height: null, bytes };
     return null;
@@ -103,6 +112,8 @@ function decodeBase64(payload: string): Uint8Array | null {
     if (payload === '') return null;
     try {
         const text = atob(payload);
+        // Rust STANDARD accepts only canonical base64, including required padding.
+        if (btoa(text) !== payload) return null;
         const bytes = new Uint8Array(text.length);
         for (let i = 0; i < text.length; i++) bytes[i] = text.charCodeAt(i);
         return bytes.length > 0 ? bytes : null;
@@ -112,7 +123,8 @@ function decodeBase64(payload: string): Uint8Array | null {
 }
 
 /**
- * Validate a signature image given as a `data:` URL or raw base64.
+ * Recognize a signature image given as a `data:` URL or raw canonical base64.
+ * Required padding must be present; whitespace and nonzero unused bits are rejected.
  * Returns `null` for empty, undecodable, corrupt, or unsupported inputs.
  */
 export function normalize(input: string): DecodedImage | null {
@@ -120,7 +132,7 @@ export function normalize(input: string): DecodedImage | null {
     const comma = input.indexOf(',');
     if (comma >= 0 && input.startsWith('data:')) {
         const meta = input.slice(0, comma);
-        if (!meta.includes(';base64')) return null;
+        if (!meta.endsWith(';base64')) return null;
         payload = input.slice(comma + 1);
     }
     const bytes = decodeBase64(payload);
@@ -150,25 +162,41 @@ export function scaleToFit(image: DecodedImage, maxPixels: number): number {
 
 /**
  * Point size for a target height, preserving aspect ratio, clamped to an
- * optional maximum width. Returns `null` when the image carries no
- * dimensions: the caller must size it.
+ * optional maximum width. Returns `null` for missing or invalid dimensions,
+ * nonpositive/nonfinite point sizes, or a nonrepresentable result.
  */
 export function signatureSize(
     image: DecodedImage,
     heightPt: number,
     maxWidthPt?: number,
 ): [number, number] | null {
-    if (image.width === null || image.height === null) return null;
-    const natural = (heightPt * image.width) / image.height;
+    if (image.width === null || image.height === null
+        || !Number.isInteger(image.width) || !Number.isInteger(image.height)
+        || image.width <= 0 || image.height <= 0
+        || image.width > 0xffffffff || image.height > 0xffffffff
+        || !Number.isFinite(heightPt) || heightPt <= 0
+        || (maxWidthPt !== undefined && (!Number.isFinite(maxWidthPt) || maxWidthPt <= 0))) return null;
+    const ratio = image.width / image.height;
+    const natural = heightPt * ratio;
+    let width = natural;
+    let height = heightPt;
     if (maxWidthPt !== undefined && natural > maxWidthPt) {
-        const scale = maxWidthPt / natural;
-        return [maxWidthPt, heightPt * scale];
+        width = maxWidthPt;
+        height = maxWidthPt / ratio;
     }
-    return [natural, heightPt];
+    return Number.isFinite(width) && Number.isFinite(height) && width > 0 && height > 0
+        ? [width, height] : null;
 }
 
 function escapePath(path: string): string {
-    return path.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+    return path.replace(/["\\\u0000-\u001f\u007f-\u009f]/g, (character) => {
+        if (character === '"') return '\\"';
+        if (character === '\\') return '\\\\';
+        if (character === '\n') return '\\n';
+        if (character === '\r') return '\\r';
+        if (character === '\t') return '\\t';
+        return `\\u{${character.charCodeAt(0).toString(16)}}`;
+    });
 }
 
 /**

package/LICENSES/FSL-1.1-ALv2.txt

@@ -1,105 +0,0 @@
-# Functional Source License, Version 1.1, ALv2 Future License
-
-## Abbreviation
-
-FSL-1.1-ALv2
-
-## Notice
-
-Copyright 2026 Julian Y. Richard Corbet
-
-## Terms and Conditions
-
-### Licensor ("We")
-
-The party offering the Software under these Terms and Conditions.
-
-### The Software
-
-The "Software" is each version of the software that we make available under
-these Terms and Conditions, as indicated by our inclusion of these Terms and
-Conditions with the Software.
-
-### License Grant
-
-Subject to your compliance with this License Grant and the Patents,
-Redistribution and Trademark clauses below, we hereby grant you the right to
-use, copy, modify, create derivative works, publicly perform, publicly display
-and redistribute the Software for any Permitted Purpose identified below.
-
-### Permitted Purpose
-
-A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
-means making the Software available to others in a commercial product or
-service that:
-
-1. substitutes for the Software;
-
-2. substitutes for any other product or service we offer using the Software
-   that exists as of the date we make the Software available; or
-
-3. offers the same or substantially similar functionality as the Software.
-
-Permitted Purposes specifically include using the Software:
-
-1. for your internal use and access;
-
-2. for non-commercial education;
-
-3. for non-commercial research; and
-
-4. in connection with professional services that you provide to a licensee
-   using the Software in accordance with these Terms and Conditions.
-
-### Patents
-
-To the extent your use for a Permitted Purpose would necessarily infringe our
-patents, the license grant above includes a license under our patents. If you
-make a claim against any party that the Software infringes or contributes to
-the infringement of any patent, then your patent license to the Software ends
-immediately.
-
-### Redistribution
-
-The Terms and Conditions apply to all copies, modifications and derivatives of
-the Software.
-
-If you redistribute any copies, modifications or derivatives of the Software,
-you must include a copy of or a link to these Terms and Conditions and not
-remove any copyright notices provided in or with the Software.
-
-### Disclaimer
-
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
-PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
-
-IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
-SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
-EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
-
-### Trademarks
-
-Except for displaying the License Details and identifying us as the origin of
-the Software, you have no right under these Terms and Conditions to use our
-trademarks, trade names, service marks or product names.
-
-## Grant of Future License
-
-We hereby irrevocably grant you an additional license to use the Software under
-the Apache License, Version 2.0 that is effective on the second anniversary of
-the date we make the Software available. On or after that date, you may use the
-Software under the Apache License, Version 2.0, in which case the following
-will apply:
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
-
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.