From 1b84ccbbe91e96ab0612a1646421de36bb0befce Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 11 Jul 2022 20:56:19 +0100 Subject: [PATCH] Ensure fileSuffix supports suffix-less loaders --- src/utilities.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/utilities.cc b/src/utilities.cc index f40a543a..8f34fb20 100644 --- a/src/utilities.cc +++ b/src/utilities.cc @@ -127,12 +127,15 @@ Napi::Value format(const Napi::CallbackInfo& info) { input.Set("buffer", hasInputBuffer); input.Set("stream", hasInputBuffer); if (hasInputFile) { - Napi::Array fileSuffix = Napi::Array::New(env); - const char **suffix = VIPS_FOREIGN_CLASS(oc)->suffs; - for (int i = 0; *suffix; i++, suffix++) { - fileSuffix.Set(i, Napi::String::New(env, *suffix)); + const VipsForeignClass *fc = VIPS_FOREIGN_CLASS(oc); + if (fc->suffs) { + Napi::Array fileSuffix = Napi::Array::New(env); + const char **suffix = fc->suffs; + for (int i = 0; *suffix; i++, suffix++) { + fileSuffix.Set(i, Napi::String::New(env, *suffix)); + } + input.Set("fileSuffix", fileSuffix); } - input.Set("fileSuffix", fileSuffix); } // Output Napi::Boolean hasOutputFile =