Fixed pointer overwrite when using full sized framebuffer

bitbank2 · bitbank2 · commit ae9705abeeeb · 2025-11-03T13:34:23.000Z
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=JPEGDEC
-version=1.8.3
+version=1.8.4
 author=Larry Bank
 maintainer=Larry Bank
 sentence=Optimized JPEG decoder for MCUs with 32K+ RAM.
diff --git a/src/jpeg.inl b/src/jpeg.inl
@@ -5124,7 +5124,9 @@ static int DecodeJPEG(JPEGIMAGE *pJPEG)
         }
         for (x = 0; x < cx && bContinue && iErr == 0; x++)
         {
-            pJPEG->usPixels = &pAlignedPixels[iDMAOffset]; // make sure output is correct offset for DMA   
+            if (pJPEG->pFramebuffer == NULL) {
+                pJPEG->usPixels = &pAlignedPixels[iDMAOffset]; // make sure output is correct offset for DMA   
+            }
 
             iSkipMask = 0; // assume not skipping
             if (bSkipRow || x*mcuCX < pJPEG->iCropX || x*mcuCX > pJPEG->iCropX+pJPEG->iCropCX) {

Original file line number	Diff line number	Diff line change
`@@ -5124,7 +5124,9 @@ static int DecodeJPEG(JPEGIMAGE *pJPEG)`
`5124`	`5124`	`}`
`5125`	`5125`	`for (x = 0; x < cx && bContinue && iErr == 0; x++)`
`5126`	`5126`	`{`
`5127`		`- pJPEG->usPixels = &pAlignedPixels[iDMAOffset]; // make sure output is correct offset for DMA`
	`5127`	`+ if (pJPEG->pFramebuffer == NULL) {`
	`5128`	`+ pJPEG->usPixels = &pAlignedPixels[iDMAOffset]; // make sure output is correct offset for DMA`
	`5129`	`+ }`
`5128`	`5130`
`5129`	`5131`	`iSkipMask = 0; // assume not skipping`
`5130`	`5132`	`if (bSkipRow \|\| xmcuCX < pJPEG->iCropX \|\| xmcuCX > pJPEG->iCropX+pJPEG->iCropCX) {`