ooxml-core 0.12.0 → 0.13.0

package/dist/crypto/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-types.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/ole2-parser-types.js
 var OLE_MAGIC = new Uint8Array([208, 207, 17, 224, 161, 177, 26, 225]);
 var ENDOFCHAIN = 4294967294;
 var FREESECT = 4294967295;
@@ -18,10 +18,13 @@ var Ole2ParseError = class extends Error {
   }
 };
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-read.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/ole2-parser-read.js
 function parseOle2(buffer) {
   const data = new Uint8Array(buffer);
   const view = new DataView(buffer);
+  if (data.length < 512) {
+    throw new Ole2ParseError("Truncated OLE2 compound file header");
+  }
   for (let i = 0; i < OLE_MAGIC.length; i++) {
     if (data[i] !== OLE_MAGIC[i]) {
       throw new Ole2ParseError("Not a valid OLE2 compound file");
@@ -35,8 +38,15 @@ function parseOle2(buffer) {
   }
   const sectorSizePower = view.getUint16(30, true);
   const miniSectorSizePower = view.getUint16(32, true);
+  if (majorVersion !== 3 && majorVersion !== 4 || sectorSizePower !== (majorVersion === 3 ? 9 : 12) || miniSectorSizePower !== 6) {
+    throw new Ole2ParseError("Unsupported OLE2 version or sector size");
+  }
   const sectorSize = 1 << sectorSizePower;
   const miniSectorSize = 1 << miniSectorSizePower;
+  if (data.length < sectorSize || data.length % sectorSize !== 0) {
+    throw new Ole2ParseError("Truncated OLE2 sector");
+  }
+  const sectorCount = data.length / sectorSize - 1;
   const totalFATSectors = view.getUint32(44, true);
   const firstDirectorySector = view.getUint32(48, true);
   const miniStreamCutoff = view.getUint32(56, true);
@@ -44,6 +54,9 @@ function parseOle2(buffer) {
   const totalMiniFATSectors = view.getUint32(64, true);
   const firstDIFATSector = view.getUint32(68, true);
   const totalDIFATSectors = view.getUint32(72, true);
+  if (totalFATSectors > sectorCount || totalMiniFATSectors > sectorCount || totalDIFATSectors > sectorCount) {
+    throw new Ole2ParseError("Allocation table count exceeds file size");
+  }
   function sectorOffset(sector) {
     return (sector + 1) * sectorSize;
   }
@@ -62,7 +75,11 @@ function parseOle2(buffer) {
     }
   }
   let difatSector = firstDIFATSector;
+  const difatSeen = /* @__PURE__ */ new Set();
   for (let d = 0; d < totalDIFATSectors && difatSector <= MAXREGSECT; d++) {
+    if (difatSeen.has(difatSector))
+      throw new Ole2ParseError("Circular DIFAT chain");
+    difatSeen.add(difatSector);
     const difatData = readSector(difatSector);
     const difatView = new DataView(difatData.buffer, difatData.byteOffset, difatData.byteLength);
     const entriesPerSector = (sectorSize - 4) / 4;
@@ -74,11 +91,14 @@ function parseOle2(buffer) {
     }
     difatSector = difatView.getUint32(sectorSize - 4, true);
   }
+  if (difatSeen.size !== totalDIFATSectors || fatSectors.length !== totalFATSectors || new Set(fatSectors).size !== fatSectors.length || fatSectors.some((id) => difatSeen.has(id))) {
+    throw new Ole2ParseError("Invalid DIFAT allocation table");
+  }
   const fatEntries = [];
   for (const fatSector of fatSectors) {
     const fatData = readSector(fatSector);
     const fatView = new DataView(fatData.buffer, fatData.byteOffset, fatData.byteLength);
-    for (let i = 0; i < sectorSize / 4; i++) {
+    for (let i = 0; i < sectorSize / 4 && fatEntries.length < sectorCount; i++) {
       fatEntries.push(fatView.getUint32(i * 4, true));
     }
   }
@@ -92,8 +112,12 @@ function parseOle2(buffer) {
       }
       visited.add(current);
       sectors.push(readSector(current));
-      current = fatEntries[current] ?? ENDOFCHAIN;
+      if (fatEntries[current] === void 0)
+        throw new Ole2ParseError("Missing FAT chain entry");
+      current = fatEntries[current];
     }
+    if (current !== ENDOFCHAIN)
+      throw new Ole2ParseError("Invalid FAT chain terminator");
     const totalLength = sectors.length * sectorSize;
     const result = new Uint8Array(totalLength);
     let offset = 0;
@@ -104,16 +128,14 @@ function parseOle2(buffer) {
     return result;
   }
   function readStream(startSector, size) {
+    if (size === 0)
+      return new Uint8Array(0);
+    if (size > sectorCount * sectorSize)
+      throw new Ole2ParseError("Stream size exceeds file size");
     const raw = readSectorChain(startSector);
-    return raw.subarray(0, Math.min(size, raw.length));
-  }
-  const miniFatEntries = [];
-  if (firstMiniFATSector <= MAXREGSECT && totalMiniFATSectors > 0) {
-    const miniFatRaw = readSectorChain(firstMiniFATSector);
-    const miniFatView = new DataView(miniFatRaw.buffer, miniFatRaw.byteOffset, miniFatRaw.byteLength);
-    for (let i = 0; i < miniFatRaw.length / 4; i++) {
-      miniFatEntries.push(miniFatView.getUint32(i * 4, true));
-    }
+    if (raw.length < size)
+      throw new Ole2ParseError("Truncated stream sector chain");
+    return raw.subarray(0, size);
   }
   const dirRaw = readSectorChain(firstDirectorySector);
   const numEntries = Math.floor(dirRaw.length / DIR_ENTRY_SIZE);
@@ -126,6 +148,9 @@ function parseOle2(buffer) {
     if (objectType === ENTRY_TYPE_EMPTY) {
       continue;
     }
+    if (nameLen < 2 || nameLen > 64 || nameLen % 2 !== 0 || entryView.getUint16(nameLen - 2, true) !== 0) {
+      throw new Ole2ParseError("Invalid directory entry name");
+    }
     const nameBytes = Math.max(0, nameLen - 2);
     let name = "";
     for (let j = 0; j < nameBytes; j += 2) {
@@ -139,8 +164,11 @@ function parseOle2(buffer) {
     const sizeLow = entryView.getUint32(120, true);
     let size = sizeLow;
     if (majorVersion === 4) {
-      entryView.getUint32(124, true);
-      size = sizeLow;
+      const sizeHigh = entryView.getUint32(124, true);
+      size = sizeLow + sizeHigh * 4294967296;
+      if (!Number.isSafeInteger(size) || size > sectorCount * sectorSize) {
+        throw new Ole2ParseError("Stream size exceeds supported file bounds");
+      }
     }
     entries.push({
       name,
@@ -154,11 +182,28 @@ function parseOle2(buffer) {
     });
   }
   const rootEntry = entries.find((e) => e.type === ENTRY_TYPE_ROOT);
+  if (!rootEntry || entries.filter((e) => e.type === ENTRY_TYPE_ROOT).length !== 1) {
+    throw new Ole2ParseError("Invalid root directory entry");
+  }
   let miniStreamData;
   if (rootEntry && rootEntry.startSector <= MAXREGSECT) {
-    miniStreamData = readSectorChain(rootEntry.startSector);
+    miniStreamData = readStream(rootEntry.startSector, rootEntry.size);
+  }
+  const miniFatEntries = [];
+  if (firstMiniFATSector <= MAXREGSECT && totalMiniFATSectors > 0) {
+    const miniFatRaw = readSectorChain(firstMiniFATSector);
+    if (miniFatRaw.length !== totalMiniFATSectors * sectorSize) {
+      throw new Ole2ParseError("Unexpected mini FAT chain length");
+    }
+    const miniFatView = new DataView(miniFatRaw.buffer, miniFatRaw.byteOffset, miniFatRaw.byteLength);
+    const miniCapacity = Math.floor((miniStreamData?.length ?? 0) / miniSectorSize);
+    for (let i = 0; i < miniFatRaw.length / 4 && i < miniCapacity; i++) {
+      miniFatEntries.push(miniFatView.getUint32(i * 4, true));
+    }
   }
   function readMiniStream(startSector, size) {
+    if (size === 0)
+      return new Uint8Array(0);
     if (!miniStreamData) {
       throw new Ole2ParseError("Mini stream container not found");
     }
@@ -171,17 +216,24 @@ function parseOle2(buffer) {
       }
       visited.add(current);
       const offset2 = current * miniSectorSize;
+      if (offset2 + miniSectorSize > miniStreamData.length || miniFatEntries[current] === void 0) {
+        throw new Ole2ParseError("Mini stream sector exceeds allocation bounds");
+      }
       sectors.push(miniStreamData.subarray(offset2, offset2 + miniSectorSize));
-      current = miniFatEntries[current] ?? ENDOFCHAIN;
+      current = miniFatEntries[current];
     }
+    if (current !== ENDOFCHAIN)
+      throw new Ole2ParseError("Invalid mini FAT chain terminator");
     const totalLength = sectors.length * miniSectorSize;
+    if (totalLength < size)
+      throw new Ole2ParseError("Truncated mini stream sector chain");
     const result = new Uint8Array(totalLength);
     let offset = 0;
     for (const sector of sectors) {
       result.set(sector, offset);
       offset += miniSectorSize;
     }
-    return result.subarray(0, Math.min(size, result.length));
+    return result.subarray(0, size);
   }
   function getStream(name) {
     const entry = entries.find((e) => (e.type === ENTRY_TYPE_STREAM || e.type === ENTRY_TYPE_ROOT) && e.name === name);
@@ -196,7 +248,7 @@ function parseOle2(buffer) {
   return { entries, getStream };
 }
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/utils/ooxml-crypto-primitives.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/utils/ooxml-crypto-primitives.js
 function getSubtle() {
   if (typeof globalThis.crypto !== "undefined" && globalThis.crypto.subtle) {
     return globalThis.crypto.subtle;
@@ -1128,13 +1180,16 @@ var EncryptedFileError = class extends Error {
   }
 };
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-helpers.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-helpers.js
 function compareDirEntryNames(a, b) {
+  const ua = a.toUpperCase();
+  const ub = b.toUpperCase();
+  if (ua.length !== a.length || ub.length !== b.length) {
+    throw new Error("CFB stream names with expanding uppercase mappings are unsupported");
+  }
   if (a.length !== b.length) {
     return a.length - b.length;
   }
-  const ua = a.toUpperCase();
-  const ub = b.toUpperCase();
   for (let i = 0; i < ua.length; i++) {
     const diff = ua.charCodeAt(i) - ub.charCodeAt(i);
     if (diff !== 0) {
@@ -1151,6 +1206,24 @@ function encodeName(name) {
   }
   return bytes;
 }
+function buildDirectoryTree(entryCount) {
+  const links = /* @__PURE__ */ new Map();
+  let redLevel = 0;
+  for (let remaining = entryCount - 2; remaining >= 0; remaining = Math.floor(remaining / 2) - 1)
+    redLevel++;
+  const build = (low, high, level) => {
+    if (low > high)
+      return 4294967295;
+    const id = Math.floor((low + high) / 2);
+    links.set(id, {
+      left: build(low, id - 1, level + 1),
+      right: build(id + 1, high, level + 1),
+      color: level === redLevel ? 0 : 1
+    });
+    return id;
+  };
+  return { root: build(1, entryCount - 1, 0), links };
+}
 function writeFatChain(fat, chain) {
   for (let i = 0; i < chain.sectors.length; i++) {
     fat[chain.sectors[i]] = i < chain.sectors.length - 1 ? chain.sectors[i + 1] : ENDOFCHAIN;
@@ -1174,7 +1247,7 @@ function writeInt32Sectors(outBytes, int32Data, firstSector, numSectors, sectorS
   }
 }
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-serialize.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-serialize.js
 function writeHeader(outView, outBytes, params) {
   outBytes.set(OLE_MAGIC, 0);
   outView.setUint16(24, 62, true);
@@ -1232,6 +1305,7 @@ function writeDifatSectors(outView, params) {
 function serializeDirectoryEntries(dirEntries, numDirSectors, sectorSize) {
   const dirData = new Uint8Array(numDirSectors * sectorSize);
   const dirView = new DataView(dirData.buffer);
+  const tree = buildDirectoryTree(dirEntries.length);
   for (let i = 0; i < dirEntries.length; i++) {
     const entry = dirEntries[i];
     const entryOffset = i * DIR_ENTRY_SIZE;
@@ -1239,17 +1313,17 @@ function serializeDirectoryEntries(dirEntries, numDirSectors, sectorSize) {
     dirData.set(nameBytes.subarray(0, Math.min(nameBytes.length, 64)), entryOffset);
     dirView.setUint16(entryOffset + 64, Math.min((entry.name.length + 1) * 2, 64), true);
     dirData[entryOffset + 66] = entry.type;
-    dirData[entryOffset + 67] = 1;
+    dirData[entryOffset + 67] = i === 0 ? 1 : tree.links.get(i).color;
     if (entry.clsid) {
       dirData.set(entry.clsid.subarray(0, 16), entryOffset + 80);
     }
     if (i === 0) {
       dirView.setUint32(entryOffset + 68, 4294967295, true);
       dirView.setUint32(entryOffset + 72, 4294967295, true);
-      dirView.setUint32(entryOffset + 76, dirEntries.length > 1 ? 1 : 4294967295, true);
+      dirView.setUint32(entryOffset + 76, tree.root, true);
     } else {
-      dirView.setUint32(entryOffset + 68, 4294967295, true);
-      dirView.setUint32(entryOffset + 72, i + 1 < dirEntries.length ? i + 1 : 4294967295, true);
+      dirView.setUint32(entryOffset + 68, tree.links.get(i).left, true);
+      dirView.setUint32(entryOffset + 72, tree.links.get(i).right, true);
       dirView.setUint32(entryOffset + 76, 4294967295, true);
     }
     dirView.setUint32(entryOffset + 116, entry.startSector, true);
@@ -1266,10 +1340,23 @@ function writeStreamSectors(outBytes, streamData, chain, sectorSize) {
   }
 }
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-write.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/ole2-parser-write.js
 function buildOle2(streams2, rootClsid, miniStreamCutoff = 4096) {
   const sectorSize = 512;
   const miniSectorSize = 64;
+  const names = [...streams2.keys()].sort(compareDirEntryNames);
+  for (let i = 0; i < names.length; i++) {
+    const name = names[i];
+    if (name.toUpperCase().length !== name.length) {
+      throw new Error("CFB stream names with expanding uppercase mappings are unsupported");
+    }
+    if (!name.length || name.length > 31 || /[\x00\\/:!]/.test(name)) {
+      throw new Error("CFB stream names must be 1-31 UTF-16 code units without NUL, \\, /, :, or !");
+    }
+    if (i > 0 && compareDirEntryNames(names[i - 1], name) === 0) {
+      throw new Error("Duplicate CFB stream names");
+    }
+  }
   const regularStreams = [];
   const miniStreams = [];
   for (const [name, data] of streams2) {
@@ -1287,7 +1374,7 @@ function buildOle2(streams2, rootClsid, miniStreamCutoff = 4096) {
     for (let i = 0; i < numSectors; i++) {
       sectors.push(nextSector++);
     }
-    fatChains.set(stream.name, { start: sectors[0] ?? 0, sectors });
+    fatChains.set(stream.name, { start: sectors[0] ?? ENDOFCHAIN, sectors });
   }
   let miniStreamContainer = new Uint8Array(0);
   const miniFatChains = /* @__PURE__ */ new Map();
@@ -1310,7 +1397,7 @@ function buildOle2(streams2, rootClsid, miniStreamCutoff = 4096) {
         miniOffset += miniSectorSize;
       }
       miniFatChains.set(stream.name, {
-        start: miniSectors[0] ?? 0,
+        start: miniSectors[0] ?? ENDOFCHAIN,
         sectors: miniSectors
       });
     }
@@ -1358,7 +1445,7 @@ function buildOle2(streams2, rootClsid, miniStreamCutoff = 4096) {
   nextSector += numDirSectors;
   let firstMiniFATSector = ENDOFCHAIN;
   let numMiniFATSectors = 0;
-  if (miniStreams.length > 0) {
+  if (nextMiniSector > 0) {
     numMiniFATSectors = Math.ceil(nextMiniSector * 4 / sectorSize);
     firstMiniFATSector = nextSector;
     nextSector += numMiniFATSectors;

package/dist/crypto/index.mjs

@@ -1,4 +1,4 @@
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-types.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/ole2-parser-types.js
 var OLE_MAGIC = new Uint8Array([208, 207, 17, 224, 161, 177, 26, 225]);
 var ENDOFCHAIN = 4294967294;
 var FREESECT = 4294967295;
@@ -16,10 +16,13 @@ var Ole2ParseError = class extends Error {
   }
 };
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-read.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/ole2-parser-read.js
 function parseOle2(buffer) {
   const data = new Uint8Array(buffer);
   const view = new DataView(buffer);
+  if (data.length < 512) {
+    throw new Ole2ParseError("Truncated OLE2 compound file header");
+  }
   for (let i = 0; i < OLE_MAGIC.length; i++) {
     if (data[i] !== OLE_MAGIC[i]) {
       throw new Ole2ParseError("Not a valid OLE2 compound file");
@@ -33,8 +36,15 @@ function parseOle2(buffer) {
   }
   const sectorSizePower = view.getUint16(30, true);
   const miniSectorSizePower = view.getUint16(32, true);
+  if (majorVersion !== 3 && majorVersion !== 4 || sectorSizePower !== (majorVersion === 3 ? 9 : 12) || miniSectorSizePower !== 6) {
+    throw new Ole2ParseError("Unsupported OLE2 version or sector size");
+  }
   const sectorSize = 1 << sectorSizePower;
   const miniSectorSize = 1 << miniSectorSizePower;
+  if (data.length < sectorSize || data.length % sectorSize !== 0) {
+    throw new Ole2ParseError("Truncated OLE2 sector");
+  }
+  const sectorCount = data.length / sectorSize - 1;
   const totalFATSectors = view.getUint32(44, true);
   const firstDirectorySector = view.getUint32(48, true);
   const miniStreamCutoff = view.getUint32(56, true);
@@ -42,6 +52,9 @@ function parseOle2(buffer) {
   const totalMiniFATSectors = view.getUint32(64, true);
   const firstDIFATSector = view.getUint32(68, true);
   const totalDIFATSectors = view.getUint32(72, true);
+  if (totalFATSectors > sectorCount || totalMiniFATSectors > sectorCount || totalDIFATSectors > sectorCount) {
+    throw new Ole2ParseError("Allocation table count exceeds file size");
+  }
   function sectorOffset(sector) {
     return (sector + 1) * sectorSize;
   }
@@ -60,7 +73,11 @@ function parseOle2(buffer) {
     }
   }
   let difatSector = firstDIFATSector;
+  const difatSeen = /* @__PURE__ */ new Set();
   for (let d = 0; d < totalDIFATSectors && difatSector <= MAXREGSECT; d++) {
+    if (difatSeen.has(difatSector))
+      throw new Ole2ParseError("Circular DIFAT chain");
+    difatSeen.add(difatSector);
     const difatData = readSector(difatSector);
     const difatView = new DataView(difatData.buffer, difatData.byteOffset, difatData.byteLength);
     const entriesPerSector = (sectorSize - 4) / 4;
@@ -72,11 +89,14 @@ function parseOle2(buffer) {
     }
     difatSector = difatView.getUint32(sectorSize - 4, true);
   }
+  if (difatSeen.size !== totalDIFATSectors || fatSectors.length !== totalFATSectors || new Set(fatSectors).size !== fatSectors.length || fatSectors.some((id) => difatSeen.has(id))) {
+    throw new Ole2ParseError("Invalid DIFAT allocation table");
+  }
   const fatEntries = [];
   for (const fatSector of fatSectors) {
     const fatData = readSector(fatSector);
     const fatView = new DataView(fatData.buffer, fatData.byteOffset, fatData.byteLength);
-    for (let i = 0; i < sectorSize / 4; i++) {
+    for (let i = 0; i < sectorSize / 4 && fatEntries.length < sectorCount; i++) {
       fatEntries.push(fatView.getUint32(i * 4, true));
     }
   }
@@ -90,8 +110,12 @@ function parseOle2(buffer) {
       }
       visited.add(current);
       sectors.push(readSector(current));
-      current = fatEntries[current] ?? ENDOFCHAIN;
+      if (fatEntries[current] === void 0)
+        throw new Ole2ParseError("Missing FAT chain entry");
+      current = fatEntries[current];
     }
+    if (current !== ENDOFCHAIN)
+      throw new Ole2ParseError("Invalid FAT chain terminator");
     const totalLength = sectors.length * sectorSize;
     const result = new Uint8Array(totalLength);
     let offset = 0;
@@ -102,16 +126,14 @@ function parseOle2(buffer) {
     return result;
   }
   function readStream(startSector, size) {
+    if (size === 0)
+      return new Uint8Array(0);
+    if (size > sectorCount * sectorSize)
+      throw new Ole2ParseError("Stream size exceeds file size");
     const raw = readSectorChain(startSector);
-    return raw.subarray(0, Math.min(size, raw.length));
-  }
-  const miniFatEntries = [];
-  if (firstMiniFATSector <= MAXREGSECT && totalMiniFATSectors > 0) {
-    const miniFatRaw = readSectorChain(firstMiniFATSector);
-    const miniFatView = new DataView(miniFatRaw.buffer, miniFatRaw.byteOffset, miniFatRaw.byteLength);
-    for (let i = 0; i < miniFatRaw.length / 4; i++) {
-      miniFatEntries.push(miniFatView.getUint32(i * 4, true));
-    }
+    if (raw.length < size)
+      throw new Ole2ParseError("Truncated stream sector chain");
+    return raw.subarray(0, size);
   }
   const dirRaw = readSectorChain(firstDirectorySector);
   const numEntries = Math.floor(dirRaw.length / DIR_ENTRY_SIZE);
@@ -124,6 +146,9 @@ function parseOle2(buffer) {
     if (objectType === ENTRY_TYPE_EMPTY) {
       continue;
     }
+    if (nameLen < 2 || nameLen > 64 || nameLen % 2 !== 0 || entryView.getUint16(nameLen - 2, true) !== 0) {
+      throw new Ole2ParseError("Invalid directory entry name");
+    }
     const nameBytes = Math.max(0, nameLen - 2);
     let name = "";
     for (let j = 0; j < nameBytes; j += 2) {
@@ -137,8 +162,11 @@ function parseOle2(buffer) {
     const sizeLow = entryView.getUint32(120, true);
     let size = sizeLow;
     if (majorVersion === 4) {
-      entryView.getUint32(124, true);
-      size = sizeLow;
+      const sizeHigh = entryView.getUint32(124, true);
+      size = sizeLow + sizeHigh * 4294967296;
+      if (!Number.isSafeInteger(size) || size > sectorCount * sectorSize) {
+        throw new Ole2ParseError("Stream size exceeds supported file bounds");
+      }
     }
     entries.push({
       name,
@@ -152,11 +180,28 @@ function parseOle2(buffer) {
     });
   }
   const rootEntry = entries.find((e) => e.type === ENTRY_TYPE_ROOT);
+  if (!rootEntry || entries.filter((e) => e.type === ENTRY_TYPE_ROOT).length !== 1) {
+    throw new Ole2ParseError("Invalid root directory entry");
+  }
   let miniStreamData;
   if (rootEntry && rootEntry.startSector <= MAXREGSECT) {
-    miniStreamData = readSectorChain(rootEntry.startSector);
+    miniStreamData = readStream(rootEntry.startSector, rootEntry.size);
+  }
+  const miniFatEntries = [];
+  if (firstMiniFATSector <= MAXREGSECT && totalMiniFATSectors > 0) {
+    const miniFatRaw = readSectorChain(firstMiniFATSector);
+    if (miniFatRaw.length !== totalMiniFATSectors * sectorSize) {
+      throw new Ole2ParseError("Unexpected mini FAT chain length");
+    }
+    const miniFatView = new DataView(miniFatRaw.buffer, miniFatRaw.byteOffset, miniFatRaw.byteLength);
+    const miniCapacity = Math.floor((miniStreamData?.length ?? 0) / miniSectorSize);
+    for (let i = 0; i < miniFatRaw.length / 4 && i < miniCapacity; i++) {
+      miniFatEntries.push(miniFatView.getUint32(i * 4, true));
+    }
   }
   function readMiniStream(startSector, size) {
+    if (size === 0)
+      return new Uint8Array(0);
     if (!miniStreamData) {
       throw new Ole2ParseError("Mini stream container not found");
     }
@@ -169,17 +214,24 @@ function parseOle2(buffer) {
       }
       visited.add(current);
       const offset2 = current * miniSectorSize;
+      if (offset2 + miniSectorSize > miniStreamData.length || miniFatEntries[current] === void 0) {
+        throw new Ole2ParseError("Mini stream sector exceeds allocation bounds");
+      }
       sectors.push(miniStreamData.subarray(offset2, offset2 + miniSectorSize));
-      current = miniFatEntries[current] ?? ENDOFCHAIN;
+      current = miniFatEntries[current];
     }
+    if (current !== ENDOFCHAIN)
+      throw new Ole2ParseError("Invalid mini FAT chain terminator");
     const totalLength = sectors.length * miniSectorSize;
+    if (totalLength < size)
+      throw new Ole2ParseError("Truncated mini stream sector chain");
     const result = new Uint8Array(totalLength);
     let offset = 0;
     for (const sector of sectors) {
       result.set(sector, offset);
       offset += miniSectorSize;
     }
-    return result.subarray(0, Math.min(size, result.length));
+    return result.subarray(0, size);
   }
   function getStream(name) {
     const entry = entries.find((e) => (e.type === ENTRY_TYPE_STREAM || e.type === ENTRY_TYPE_ROOT) && e.name === name);
@@ -194,7 +246,7 @@ function parseOle2(buffer) {
   return { entries, getStream };
 }
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/utils/ooxml-crypto-primitives.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/utils/ooxml-crypto-primitives.js
 function getSubtle() {
   if (typeof globalThis.crypto !== "undefined" && globalThis.crypto.subtle) {
     return globalThis.crypto.subtle;
@@ -1126,13 +1178,16 @@ var EncryptedFileError = class extends Error {
   }
 };
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-helpers.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-helpers.js
 function compareDirEntryNames(a, b) {
+  const ua = a.toUpperCase();
+  const ub = b.toUpperCase();
+  if (ua.length !== a.length || ub.length !== b.length) {
+    throw new Error("CFB stream names with expanding uppercase mappings are unsupported");
+  }
   if (a.length !== b.length) {
     return a.length - b.length;
   }
-  const ua = a.toUpperCase();
-  const ub = b.toUpperCase();
   for (let i = 0; i < ua.length; i++) {
     const diff = ua.charCodeAt(i) - ub.charCodeAt(i);
     if (diff !== 0) {
@@ -1149,6 +1204,24 @@ function encodeName(name) {
   }
   return bytes;
 }
+function buildDirectoryTree(entryCount) {
+  const links = /* @__PURE__ */ new Map();
+  let redLevel = 0;
+  for (let remaining = entryCount - 2; remaining >= 0; remaining = Math.floor(remaining / 2) - 1)
+    redLevel++;
+  const build = (low, high, level) => {
+    if (low > high)
+      return 4294967295;
+    const id = Math.floor((low + high) / 2);
+    links.set(id, {
+      left: build(low, id - 1, level + 1),
+      right: build(id + 1, high, level + 1),
+      color: level === redLevel ? 0 : 1
+    });
+    return id;
+  };
+  return { root: build(1, entryCount - 1, 0), links };
+}
 function writeFatChain(fat, chain) {
   for (let i = 0; i < chain.sectors.length; i++) {
     fat[chain.sectors[i]] = i < chain.sectors.length - 1 ? chain.sectors[i + 1] : ENDOFCHAIN;
@@ -1172,7 +1245,7 @@ function writeInt32Sectors(outBytes, int32Data, firstSector, numSectors, sectorS
   }
 }
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-serialize.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-serialize.js
 function writeHeader(outView, outBytes, params) {
   outBytes.set(OLE_MAGIC, 0);
   outView.setUint16(24, 62, true);
@@ -1230,6 +1303,7 @@ function writeDifatSectors(outView, params) {
 function serializeDirectoryEntries(dirEntries, numDirSectors, sectorSize) {
   const dirData = new Uint8Array(numDirSectors * sectorSize);
   const dirView = new DataView(dirData.buffer);
+  const tree = buildDirectoryTree(dirEntries.length);
   for (let i = 0; i < dirEntries.length; i++) {
     const entry = dirEntries[i];
     const entryOffset = i * DIR_ENTRY_SIZE;
@@ -1237,17 +1311,17 @@ function serializeDirectoryEntries(dirEntries, numDirSectors, sectorSize) {
     dirData.set(nameBytes.subarray(0, Math.min(nameBytes.length, 64)), entryOffset);
     dirView.setUint16(entryOffset + 64, Math.min((entry.name.length + 1) * 2, 64), true);
     dirData[entryOffset + 66] = entry.type;
-    dirData[entryOffset + 67] = 1;
+    dirData[entryOffset + 67] = i === 0 ? 1 : tree.links.get(i).color;
     if (entry.clsid) {
       dirData.set(entry.clsid.subarray(0, 16), entryOffset + 80);
     }
     if (i === 0) {
       dirView.setUint32(entryOffset + 68, 4294967295, true);
       dirView.setUint32(entryOffset + 72, 4294967295, true);
-      dirView.setUint32(entryOffset + 76, dirEntries.length > 1 ? 1 : 4294967295, true);
+      dirView.setUint32(entryOffset + 76, tree.root, true);
     } else {
-      dirView.setUint32(entryOffset + 68, 4294967295, true);
-      dirView.setUint32(entryOffset + 72, i + 1 < dirEntries.length ? i + 1 : 4294967295, true);
+      dirView.setUint32(entryOffset + 68, tree.links.get(i).left, true);
+      dirView.setUint32(entryOffset + 72, tree.links.get(i).right, true);
       dirView.setUint32(entryOffset + 76, 4294967295, true);
     }
     dirView.setUint32(entryOffset + 116, entry.startSector, true);
@@ -1264,10 +1338,23 @@ function writeStreamSectors(outBytes, streamData, chain, sectorSize) {
   }
 }
 
-// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-write.js
+// node_modules/.bun/@christophervr+ole2@0.8.0/node_modules/@christophervr/ole2/dist/ole2-parser-write.js
 function buildOle2(streams2, rootClsid, miniStreamCutoff = 4096) {
   const sectorSize = 512;
   const miniSectorSize = 64;
+  const names = [...streams2.keys()].sort(compareDirEntryNames);
+  for (let i = 0; i < names.length; i++) {
+    const name = names[i];
+    if (name.toUpperCase().length !== name.length) {
+      throw new Error("CFB stream names with expanding uppercase mappings are unsupported");
+    }
+    if (!name.length || name.length > 31 || /[\x00\\/:!]/.test(name)) {
+      throw new Error("CFB stream names must be 1-31 UTF-16 code units without NUL, \\, /, :, or !");
+    }
+    if (i > 0 && compareDirEntryNames(names[i - 1], name) === 0) {
+      throw new Error("Duplicate CFB stream names");
+    }
+  }
   const regularStreams = [];
   const miniStreams = [];
   for (const [name, data] of streams2) {
@@ -1285,7 +1372,7 @@ function buildOle2(streams2, rootClsid, miniStreamCutoff = 4096) {
     for (let i = 0; i < numSectors; i++) {
       sectors.push(nextSector++);
     }
-    fatChains.set(stream.name, { start: sectors[0] ?? 0, sectors });
+    fatChains.set(stream.name, { start: sectors[0] ?? ENDOFCHAIN, sectors });
   }
   let miniStreamContainer = new Uint8Array(0);
   const miniFatChains = /* @__PURE__ */ new Map();
@@ -1308,7 +1395,7 @@ function buildOle2(streams2, rootClsid, miniStreamCutoff = 4096) {
         miniOffset += miniSectorSize;
       }
       miniFatChains.set(stream.name, {
-        start: miniSectors[0] ?? 0,
+        start: miniSectors[0] ?? ENDOFCHAIN,
         sectors: miniSectors
       });
     }
@@ -1356,7 +1443,7 @@ function buildOle2(streams2, rootClsid, miniStreamCutoff = 4096) {
   nextSector += numDirSectors;
   let firstMiniFATSector = ENDOFCHAIN;
   let numMiniFATSectors = 0;
-  if (miniStreams.length > 0) {
+  if (nextMiniSector > 0) {
     numMiniFATSectors = Math.ceil(nextMiniSector * 4 / sectorSize);
     firstMiniFATSector = nextSector;
     nextSector += numMiniFATSectors;