muhammara 3.3.0 → 3.5.0

package/CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.5.0] - 2022-12-07
+
+### Added
+
+- Electron 22.0.x
+
+## [3.4.0] - 2022-11-24
+
+### Added
+
+- Electron 21.3.x
+
+### Fixed
+
+- Several cases of NPE under different circumstances
+
 ## [3.3.0] - 2022-11-05
 
 ### Fixed
@@ -72,6 +88,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Node < 11 and Electron < 11 removed
 - Renamed typo exported value from eTokenSeprator to eTokenSeparator
 
+## [2.6.2] - 2022-11-23
+
+### Fixed
+
+- Several cases of NPE under different circumstances
+
 ## [2.6.1] - 2022-10-23
 
 ### Fixed
@@ -310,12 +332,15 @@ with the following changes.
 
 - Initial release
 
-[unreleased]: https://github.com/julianhille/MuhammaraJS/compare/3.3.0...HEAD
+[unreleased]: https://github.com/julianhille/MuhammaraJS/compare/3.5.0...HEAD
+[3.5.0]: https://github.com/julianhille/MuhammaraJS/compare/3.4.0...3.5.0
+[3.4.0]: https://github.com/julianhille/MuhammaraJS/compare/3.3.0...3.4.0
 [3.3.0]: https://github.com/julianhille/MuhammaraJS/compare/3.2.0...3.3.0
 [3.2.0]: https://github.com/julianhille/MuhammaraJS/compare/3.1.1...3.2.0
 [3.1.1]: https://github.com/julianhille/MuhammaraJS/compare/3.1.0...3.1.1
 [3.1.0]: https://github.com/julianhille/MuhammaraJS/compare/3.0.0...3.1.0
-[3.0.0]: https://github.com/julianhille/MuhammaraJS/compare/2.6.1...3.0.0
+[3.0.0]: https://github.com/julianhille/MuhammaraJS/compare/2.6.2...3.0.0
+[2.6.2]: https://github.com/julianhille/MuhammaraJS/compare/2.6.1...2.6.2
 [2.6.1]: https://github.com/julianhille/MuhammaraJS/compare/2.6.0...2.6.1
 [2.6.0]: https://github.com/julianhille/MuhammaraJS/compare/2.5.0...2.6.0
 [2.5.0]: https://github.com/julianhille/MuhammaraJS/compare/2.4.0...2.5.0

package/node_modules/minipass/index.d.ts

@@ -2,39 +2,71 @@
 import { EventEmitter } from 'events'
 import { Stream } from 'stream'
 
-export type Encoding = BufferEncoding | 'buffer' | null
-
-interface Writable extends EventEmitter {
-  end(): any
-  write(chunk: any, ...args: any[]): any
-}
-
-interface Readable extends EventEmitter {
-  pause(): any
-  resume(): any
-  pipe(): any
-}
-
-interface Pipe<R, W> {
-  src: Minipass<R, W>
-  dest: Writable
-  opts: PipeOptions
+declare namespace Minipass {
+  type Encoding = BufferEncoding | 'buffer' | null
+
+  interface Writable extends EventEmitter {
+    end(): any
+    write(chunk: any, ...args: any[]): any
+  }
+
+  interface Readable extends EventEmitter {
+    pause(): any
+    resume(): any
+    pipe(): any
+  }
+
+  interface Pipe<R, W> {
+    src: Minipass<R, W>
+    dest: Writable
+    opts: PipeOptions
+  }
+
+  type DualIterable<T> = Iterable<T> & AsyncIterable<T>
+
+  type ContiguousData = Buffer | ArrayBufferLike | ArrayBufferView | string
+
+  type BufferOrString = Buffer | string
+
+  interface StringOptions {
+    encoding: BufferEncoding
+    objectMode?: boolean
+    async?: boolean
+  }
+
+  interface BufferOptions {
+    encoding?: null | 'buffer'
+    objectMode?: boolean
+    async?: boolean
+  }
+
+  interface ObjectModeOptions {
+    objectMode: true
+    async?: boolean
+  }
+
+  interface PipeOptions {
+    end?: boolean
+    proxyErrors?: boolean
+  }
+
+  type Options<T> = T extends string
+    ? StringOptions
+    : T extends Buffer
+    ? BufferOptions
+    : ObjectModeOptions
 }
 
-type DualIterable<T> = Iterable<T> & AsyncIterable<T>
-
-type ContiguousData = Buffer | ArrayBufferLike | ArrayBufferView | string
-
-type BufferOrString = Buffer | string
-
-export default class Minipass<
+declare class Minipass<
     RType extends any = Buffer,
-    WType extends any = RType extends BufferOrString ? ContiguousData : RType
+    WType extends any = RType extends Minipass.BufferOrString
+      ? Minipass.ContiguousData
+      : RType
   >
   extends Stream
-  implements DualIterable<RType>
+  implements Minipass.DualIterable<RType>
 {
-  static isStream(stream: any): stream is Readable | Writable
+  static isStream(stream: any): stream is Minipass.Readable | Minipass.Writable
 
   readonly bufferLength: number
   readonly flowing: boolean
@@ -48,7 +80,7 @@ export default class Minipass<
    * Not technically private or readonly, but not safe to mutate.
    */
   private readonly buffer: RType[]
-  private readonly pipes: Pipe<RType, WType>[]
+  private readonly pipes: Minipass.Pipe<RType, WType>[]
 
   /**
    * Technically writable, but mutating it can change the type,
@@ -70,31 +102,31 @@ export default class Minipass<
    * TypeScript does not provide many options for changing the type of
    * an object at run-time, which is what changing the encoding does.
    */
-  readonly encoding: Encoding
+  readonly encoding: Minipass.Encoding
   // setEncoding(encoding: Encoding): void
 
   // Options required if not reading buffers
   constructor(
     ...args: RType extends Buffer
-      ? [] | [Options<RType>]
-      : [Options<RType>]
+      ? [] | [Minipass.Options<RType>]
+      : [Minipass.Options<RType>]
   )
 
   write(chunk: WType, cb?: () => void): boolean
-  write(chunk: WType, encoding?: Encoding, cb?: () => void): boolean
+  write(chunk: WType, encoding?: Minipass.Encoding, cb?: () => void): boolean
   read(size?: number): RType
   end(cb?: () => void): this
   end(chunk: any, cb?: () => void): this
-  end(chunk: any, encoding?: Encoding, cb?: () => void): this
+  end(chunk: any, encoding?: Minipass.Encoding, cb?: () => void): this
   pause(): void
   resume(): void
   promise(): Promise<void>
   collect(): Promise<RType[]>
 
-  concat(): RType extends BufferOrString ? Promise<RType> : never
+  concat(): RType extends Minipass.BufferOrString ? Promise<RType> : never
   destroy(er?: any): void
-  pipe<W extends Writable>(dest: W, opts?: PipeOptions): W
-  unpipe<W extends Writable>(dest: W): void
+  pipe<W extends Minipass.Writable>(dest: W, opts?: Minipass.PipeOptions): W
+  unpipe<W extends Minipass.Writable>(dest: W): void
 
   /**
    * alias for on()
@@ -120,30 +152,4 @@ export default class Minipass<
   [Symbol.asyncIterator](): AsyncIterator<RType>
 }
 
-interface StringOptions {
-  encoding: BufferEncoding
-  objectMode?: boolean
-  async?: boolean
-}
-
-interface BufferOptions {
-  encoding?: null | 'buffer'
-  objectMode?: boolean
-  async?: boolean
-}
-
-interface ObjectModeOptions {
-  objectMode: true
-  async?: boolean
-}
-
-export declare interface PipeOptions {
-  end?: boolean
-  proxyErrors?: boolean
-}
-
-export declare type Options<T> = T extends string
-  ? StringOptions
-  : T extends Buffer
-  ? BufferOptions
-  : ObjectModeOptions
+export = Minipass

package/node_modules/minipass/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "minipass@^3.0.0",
-  "_id": "minipass@3.3.4",
+  "_id": "minipass@3.3.6",
   "_inBundle": false,
-  "_integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+  "_integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
   "_location": "/minipass",
   "_phantomChildren": {},
   "_requested": {
@@ -20,8 +20,8 @@
     "/minizlib",
     "/tar"
   ],
-  "_resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
-  "_shasum": "ca99f95dd77c43c7a76bf51e6d200025eee0ffae",
+  "_resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+  "_shasum": "7bba384db3a1520d18c9c0e5251c3444e95dd94a",
   "_spec": "minipass@^3.0.0",
   "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/tar",
   "author": {
@@ -79,12 +79,13 @@
   },
   "scripts": {
     "postpublish": "git push origin --follow-tags",
-    "postversion": "npm publish --tag=next",
+    "postversion": "npm publish",
     "preversion": "npm test",
     "test": "tap"
   },
   "tap": {
     "check-coverage": true
   },
-  "version": "3.3.4"
+  "types": "index.d.ts",
+  "version": "3.3.6"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muhammara",
-  "version": "3.3.0",
+  "version": "3.5.0",
   "description": "Create, read and modify PDF files and streams. A drop in replacement for hummusjs PDF library",
   "homepage": "https://github.com/julianhille/Muhammarajs",
   "license": "Apache-2.0",

package/src/deps/PDFWriter/CFFFileInput.cpp

@@ -1018,7 +1018,13 @@ EStatusCode CFFFileInput::CalculateDependenciesForCharIndex(unsigned short inFon
 	if(status != PDFHummus::eFailure)
 	{
 		mCurrentDependencies = &ioDependenciesInfo;
-		return interpreter.Intepret(*GetGlyphCharString(inFontIndex,inCharStringIndex),this);
+		CharString* charString = GetGlyphCharString(inFontIndex,inCharStringIndex);
+        if(!charString)
+        {
+            TRACE_LOG("GetGlyphCharString cannot find char string");
+            return PDFHummus::eFailure;
+        }
+		return interpreter.Intepret(*charString, this);
 	}
 	else
 		return status;

package/src/deps/PDFWriter/DecryptionHelper.cpp

@@ -409,7 +409,7 @@ XCryptionCommon* DecryptionHelper::GetCryptForStream(PDFStreamInput* inStream) {
 			for (; i < filterObjectArray->GetLength(); ++i)
 			{
 				PDFObjectCastPtr<PDFName> filterObjectItem(filterObjectArray->QueryObject(i));
-				if (filterObjectItem->GetValue() == "Crypt")
+				if (!filterObjectItem || filterObjectItem->GetValue() == "Crypt")
 					break;
 			}
 			if (i < filterObjectArray->GetLength()) {

package/src/deps/PDFWriter/DocumentContext.cpp

@@ -2176,7 +2176,7 @@ EStatusCode DocumentContext::SetupModifiedFile(PDFParser* inModifiedFileParser)
     if(idArray.GetPtr() && idArray->GetLength() == 2)
     {
         PDFObjectCastPtr<PDFHexString> firstID = idArray->QueryObject(0);
-        if(firstID.GetPtr())
+        if(firstID != NULL && firstID.GetPtr())
             mModifiedDocumentID = firstID->GetValue();
     }
 
@@ -2300,6 +2300,10 @@ EStatusCode	DocumentContext::FinalizeModifiedPDF(PDFParser* inModifiedFileParser
         {
 			// use an extender to copy original catalog elements and update version if required
 			PDFDocumentCopyingContext* copyingContext = CreatePDFCopyingContext(inModifiedFileParser);
+			if(!copyingContext) {
+			    status = eFailure;
+			    break;
+			}
 			ModifiedDocCatalogWriterExtension catalogUpdate(copyingContext,requiresVersionUpdate,inModifiedPDFVersion);
             status = WriteCatalogObject(finalPageRoot,&catalogUpdate);
 			delete copyingContext;
@@ -2311,8 +2315,9 @@ EStatusCode	DocumentContext::FinalizeModifiedPDF(PDFParser* inModifiedFileParser
 		WriteInfoDictionary();
 
 		// write encryption dictionary, if encrypting
-		CopyEncryptionDictionary(inModifiedFileParser);
-
+		status = CopyEncryptionDictionary(inModifiedFileParser);
+        if(status != eSuccess)
+            break;
         if(RequiresXrefStream(inModifiedFileParser))
         {
             status = WriteXrefStream(xrefTablePosition);
@@ -2398,8 +2403,11 @@ bool DocumentContext::DocumentHasNewPages()
         hasLeafs = pageTreeRoot->IsLeafParent();
         if(pageTreeRoot->GetNodesCount() == 0)
             break;
-        else
+        else {
             pageTreeRoot = pageTreeRoot->GetPageTreeChild(0);
+            if (!pageTreeRoot)
+                break;
+        }
     }
 
     return hasLeafs;
@@ -2526,12 +2534,12 @@ bool DocumentContext::DoExtendersRequireCatalogUpdate(PDFParser* inModifiedFileP
     return isUpdateRequired;
 }
 
-void DocumentContext::CopyEncryptionDictionary(PDFParser* inModifiedFileParser)
+EStatusCode DocumentContext::CopyEncryptionDictionary(PDFParser* inModifiedFileParser)
 {
 	// Reuse original encryption dict for new modified trailer. for sake of simplicity (with trailer using ref for encrypt), make it indirect if not already
 	RefCountPtr<PDFObject> encrypt(inModifiedFileParser->GetTrailer()->QueryDirectObject("Encrypt"));
 	if (encrypt.GetPtr() == NULL)
-		return;
+		return eSuccess;
 
 	if (encrypt->GetType() == PDFObject::ePDFObjectIndirectObjectReference)
 	{
@@ -2540,11 +2548,15 @@ void DocumentContext::CopyEncryptionDictionary(PDFParser* inModifiedFileParser)
 	}
 	else
 	{
+		// copying context, write as is
+		PDFDocumentCopyingContext* copyingContext = CreatePDFCopyingContext(inModifiedFileParser);
+		if(!copyingContext) {
+			return eFailure;
+		}
 		// copy to indirect object and set refrence
 		mEncryptionHelper.PauseEncryption();
 		ObjectIDType encryptionDictionaryID = mObjectsContext->StartNewIndirectObject();
-		// copying context, write as is
-		PDFDocumentCopyingContext* copyingContext = CreatePDFCopyingContext(inModifiedFileParser);
+
 		copyingContext->CopyDirectObjectAsIs(encrypt.GetPtr());
 		delete copyingContext;
 		mObjectsContext->EndIndirectObject();
@@ -2552,6 +2564,7 @@ void DocumentContext::CopyEncryptionDictionary(PDFParser* inModifiedFileParser)
 
 		mTrailerInformation.SetEncrypt(encryptionDictionaryID);
 	}
+	return eSuccess;
 }
 
 bool DocumentContext::RequiresXrefStream(PDFParser* inModifiedFileParser)

package/src/deps/PDFWriter/DocumentContext.h

@@ -432,7 +432,7 @@ namespace PDFHummus
         ObjectIDType WriteCombinedPageTree(PDFParser* inModifiedFileParser);
         bool IsRequiredVersionHigherThanPDFVersion(PDFParser* inModifiedFileParser,EPDFVersion inModifiedPDFVersion);
         bool DoExtendersRequireCatalogUpdate(PDFParser* inModifiedFileParser);
-		void CopyEncryptionDictionary(PDFParser* inModifiedFileParser);
+	    PDFHummus::EStatusCode CopyEncryptionDictionary(PDFParser* inModifiedFileParser);
 		bool RequiresXrefStream(PDFParser* inModifiedFileParser);
         PDFHummus::EStatusCode WriteXrefStream(LongFilePositionType& outXrefPosition);
 		HummusImageInformation& GetImageInformationStructFor(const std::string& inImageFile,unsigned long inImageIndex);

package/src/deps/PDFWriter/PDFModifiedPage.cpp

@@ -163,6 +163,8 @@ PDFHummus::EStatusCode PDFModifiedPage::WritePage()
 		// get the page object
 		ObjectIDType pageObjectID = copyingContext->GetSourceDocumentParser()->GetPageObjectID(mPageIndex);
 		PDFObjectCastPtr<PDFDictionary> pageDictionaryObject = copyingContext->GetSourceDocumentParser()->ParsePage(mPageIndex);
+		if (!pageDictionaryObject)
+		    return eFailure;
 		MapIterator<PDFNameToPDFObjectMap>  pageDictionaryObjectIt = pageDictionaryObject->GetIterator();
 
 		// create modified page object

package/src/deps/PDFWriter/PDFPageInput.cpp

@@ -181,7 +181,13 @@ void PDFPageInput::SetPDFRectangleFromPDFArray(PDFArray* inPDFArray,PDFRectangle
 	RefCountPtr<PDFObject> lowerLeftY(inPDFArray->QueryObject(1));
 	RefCountPtr<PDFObject> upperRightX(inPDFArray->QueryObject(2));
 	RefCountPtr<PDFObject> upperRightY(inPDFArray->QueryObject(3));
-	
+	if (!lowerLeftX || !lowerLeftY || !upperRightX || !upperRightY)
+	{
+		// not sure if just a return is a good idea here.
+		// Things wont jus work and might go unnoticed
+		TRACE_LOG("Could not apply pdf rectangle as values are NULL");
+		return;
+	}
 	outPDFRectangle.LowerLeftX = ParsedPrimitiveHelper(lowerLeftX.GetPtr()).GetAsDouble();
 	outPDFRectangle.LowerLeftY = ParsedPrimitiveHelper(lowerLeftY.GetPtr()).GetAsDouble();
 	outPDFRectangle.UpperRightX = ParsedPrimitiveHelper(upperRightX.GetPtr()).GetAsDouble();

package/src/deps/PDFWriter/PDFParser.cpp

@@ -396,6 +396,12 @@ EStatusCode PDFParser::ParseLastXrefPosition()
 			while(!foundStartXref && mStream->NotEnded())
 			{
 				PDFObjectCastPtr<PDFSymbol> startxRef(mObjectParser.ParseNewObject());
+				if(!startxRef)
+				{
+					status = PDFHummus::eFailure;
+				    TRACE_LOG("PDFParser::ParseXrefPosition, syntax error in reading xref position");
+				    break;
+				}
 				foundStartXref = startxRef.GetPtr() && (startxRef->GetValue() == scStartxref);
 			}
 

package/src/deps/PDFWriter/PDFUsedFont.cpp

@@ -68,7 +68,8 @@ EStatusCode PDFUsedFont::EncodeStringForShowing(const GlyphUnicodeMappingList& i
 
 	if(!mWrittenFont)
 		mWrittenFont = mFaceWrapper.CreateWrittenFontObject(mObjectsContext,mEmbedFont);
-
+	if(!mWrittenFont)
+		return PDFHummus::eFailure;
 	mWrittenFont->AppendGlyphs(inText,outCharactersToUse,outTreatCharactersAsCID,outFontObjectToUse);
 
 	return PDFHummus::eSuccess;
@@ -108,7 +109,8 @@ EStatusCode PDFUsedFont::EncodeStringsForShowing(const GlyphUnicodeMappingListLi
 
 	if(!mWrittenFont)
 		mWrittenFont = mFaceWrapper.CreateWrittenFontObject(mObjectsContext,mEmbedFont);
-
+	if(!mWrittenFont)
+		return PDFHummus::eFailure;
 	mWrittenFont->AppendGlyphs(inText,outCharactersToUse,outTreatCharactersAsCID,outFontObjectToUse);
 
 	return PDFHummus::eSuccess;

package/src/deps/PDFWriter/TrueTypeEmbeddedFontWriter.cpp

@@ -416,6 +416,9 @@ EStatusCode TrueTypeEmbeddedFontWriter::WriteHead()
 	// and store the offset to the checksum
 
 	TableEntry* tableEntry = mTrueTypeInput.GetTableEntry("head");
+	if (!tableEntry) {
+		return PDFHummus::eFailure;
+	}
 	LongFilePositionType startTableOffset;
 	OutputStreamTraits streamCopier(&mFontFileStream);
 	LongFilePositionType endOfStream;
@@ -485,6 +488,9 @@ EStatusCode TrueTypeEmbeddedFontWriter::WriteHHea()
 	// count is lower
 
 	TableEntry* tableEntry = mTrueTypeInput.GetTableEntry("hhea");
+	if (!tableEntry) {
+		return PDFHummus::eFailure;
+	}
 	LongFilePositionType startTableOffset;
 	OutputStreamTraits streamCopier(&mFontFileStream);
 	LongFilePositionType endOfStream;
@@ -556,6 +562,9 @@ EStatusCode TrueTypeEmbeddedFontWriter::WriteMaxp()
 	// copy as is, then adjust the glyphs count
 
 	TableEntry* tableEntry = mTrueTypeInput.GetTableEntry("maxp");
+	if (!tableEntry) {
+		return PDFHummus::eFailure;
+	}
 	LongFilePositionType startTableOffset;
 	OutputStreamTraits streamCopier(&mFontFileStream);
 	LongFilePositionType endOfStream;
@@ -602,6 +611,9 @@ EStatusCode TrueTypeEmbeddedFontWriter::WriteGlyf(const UIntVector& inSubsetGlyp
 	// while at it...update the locaTable
 
 	TableEntry* tableEntry = mTrueTypeInput.GetTableEntry("glyf");
+	if (!tableEntry) {
+		return PDFHummus::eFailure;
+	}
 	LongFilePositionType startTableOffset = mFontFileStream.GetCurrentPosition();
 	UIntVector::const_iterator it = inSubsetGlyphIDs.begin();
 	OutputStreamTraits streamCopier(&mFontFileStream);
@@ -706,6 +718,9 @@ EStatusCode TrueTypeEmbeddedFontWriter::CreateTableCopy(const char* inTableName,
 	// copy as is, no adjustments required
 
 	TableEntry* tableEntry = mTrueTypeInput.GetTableEntry(inTableName);
+	if (!tableEntry) {
+		return PDFHummus::eFailure;
+	}
 	LongFilePositionType startTableOffset;
 	OutputStreamTraits streamCopier(&mFontFileStream);
 	LongFilePositionType endOfStream;