spessasynth_core 3.26.31 → 3.26.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spessasynth_core",
-  "version": "3.26.31",
+  "version": "3.26.32",
   "description": "MIDI and SoundFont2/DLS library with no compromises",
   "main": "index.js",
   "type": "module",

package/src/soundfont/basic_soundfont/riff_chunk.js

@@ -54,6 +54,13 @@ export function readRIFFChunk(dataArray, readData = true, forceShift = false)
     let header = readBytesAsString(dataArray, 4);
     
     let size = readLittleEndian(dataArray, 4);
+    if (header === "")
+    {
+        // safeguard against evil DLS files
+        // The test case: CrysDLS v1.23.dls
+        // https://github.com/spessasus/spessasynth_core/issues/5
+        size = 0;
+    }
     /**
      * @type {IndexedByteArray}
      */

package/src/soundfont/dls/dls_soundfont.js

@@ -8,7 +8,6 @@ import { readLittleEndian } from "../../utils/byte_functions/little_endian.js";
 import { readDLSInstrumentList } from "./read_instrument_list.js";
 import { readDLSInstrument } from "./read_instrument.js";
 import { readLart } from "./read_lart.js";
-import { readRegion } from "./read_region.js";
 import { readDLSSamples } from "./read_samples.js";
 
 class DLSSoundFont extends BasicSoundBank
@@ -178,7 +177,6 @@ class DLSSoundFont extends BasicSoundBank
 
 DLSSoundFont.prototype.readDLSInstrumentList = readDLSInstrumentList;
 DLSSoundFont.prototype.readDLSInstrument = readDLSInstrument;
-DLSSoundFont.prototype.readRegion = readRegion;
 DLSSoundFont.prototype.readLart = readLart;
 DLSSoundFont.prototype.readDLSSamples = readDLSSamples;
 

package/src/soundfont/dls/read_instrument.js

@@ -7,6 +7,7 @@ import { consoleColors } from "../../utils/other.js";
 import { Modulator } from "../basic_soundfont/modulator.js";
 import { DEFAULT_DLS_CHORUS, DEFAULT_DLS_REVERB } from "./dls_sources.js";
 import { generatorLimits, generatorTypes } from "../basic_soundfont/generator_types.js";
+import { readRegion } from "./read_region.js";
 
 /**
  * @this {DLSSoundFont}
@@ -40,7 +41,7 @@ export function readDLSInstrument(chunk)
     const preset = new DLSPreset(this, ulBank, ulInstrument);
     
     // read preset name in INFO
-    let presetName = "unnamedPreset";
+    let presetName = ``;
     const infoChunk = findRIFFListType(chunks, "INFO");
     if (infoChunk)
     {
@@ -51,6 +52,10 @@ export function readDLSInstrument(chunk)
         }
         presetName = readBytesAsString(info.chunkData, info.chunkData.length).trim();
     }
+    if (presetName.length < 1)
+    {
+        presetName = `unnamed ${(ulBank >> 8) & 127}:${ulInstrument & 127}`;
+    }
     preset.presetName = presetName;
     preset.dlsInstrument.instrumentName = presetName;
     SpessaSynthGroupCollapsed(
@@ -105,8 +110,7 @@ export function readDLSInstrument(chunk)
         }
         
         
-        const zone = preset.dlsInstrument.createZone();
-        this.readRegion(chunk, zone);
+        readRegion.call(this, chunk, preset.dlsInstrument);
     }
     this.addPresets(preset);
     this.addInstruments(preset.dlsInstrument);

package/src/soundfont/dls/read_region.js

@@ -2,13 +2,14 @@ import { readLittleEndian, signedInt16 } from "../../utils/byte_functions/little
 import { findRIFFListType, readRIFFChunk } from "../basic_soundfont/riff_chunk.js";
 import { Generator } from "../basic_soundfont/generator.js";
 import { generatorTypes } from "../basic_soundfont/generator_types.js";
+import { SpessaSynthWarn } from "../../utils/loggin.js";
 
 /**
  * @this {DLSSoundFont}
  * @param chunk {RiffChunk}
- * @param zone {DLSZone}
+ * @param instrument {DLSInstrument}
  */
-export function readRegion(chunk, zone)
+export function readRegion(chunk, instrument)
 {
     // regions are essentially instrument zones
     
@@ -24,6 +25,12 @@ export function readRegion(chunk, zone)
     
     // region header
     const regionHeader = regionChunks.find(c => c.header === "rgnh");
+    
+    if (!regionHeader)
+    {
+        SpessaSynthWarn("Invalid DLS region: missing 'rgnh' chunk! Discarding...");
+        return;
+    }
     // key range
     let keyMin = readLittleEndian(regionHeader.chunkData, 2);
     let keyMax = readLittleEndian(regionHeader.chunkData, 2);
@@ -38,7 +45,8 @@ export function readRegion(chunk, zone)
         velMin = 0;
     }
     // cannot do the same to key zones sadly
-    
+    // create zone
+    const zone = instrument.createZone();
     // apply ranges
     zone.keyRange = { min: keyMin, max: keyMax };
     zone.velRange = { min: velMin, max: velMax };