Attachment 6597 Details for Bug 37269

[patch] patch: fix_computerroom_segfault_due_to_libqjpeg

009_fix_computerroom_segfault_due_to_libqjpeg.patch (text/plain), 1.65 KB, created by Alexander Kramer on 2015-01-13 16:01 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Kramer

Created: 2015-01-13 16:01 CET

Size: 1.65 KB

patch

obsolete

>diff -Nur italc-2.0.0_orig//lib/src/ItalcVncConnection.cpp italc-2.0.0_working_copy//lib/src/ItalcVncConnection.cpp
>--- italc-2.0.0_orig//lib/src/ItalcVncConnection.cpp	2011-08-03 23:18:00.000000000 +0200
>+++ italc-2.0.0_working_copy//lib/src/ItalcVncConnection.cpp	2015-01-13 15:53:03.620000000 +0100
>@@ -118,22 +118,26 @@
> 
> 	const int size = (int) cl->width * cl->height *
> 					( cl->format.bitsPerPixel / 8 );
>-	if( t->m_frameBuffer )
>-	{
>-		// do not leak if we get a new framebuffer size
>-		delete [] t->m_frameBuffer;
>-	}
>-	t->m_frameBuffer = new uint8_t[size];
>-	t->m_framebufferInitialized = false;
>-	cl->frameBuffer = t->m_frameBuffer;
>-	memset( cl->frameBuffer, '\0', size );
>-	cl->format.bitsPerPixel = 32;
>-	cl->format.redShift = 16;
>-	cl->format.greenShift = 8;
>-	cl->format.blueShift = 0;
>-	cl->format.redMax = 0xff;
>-	cl->format.greenMax = 0xff;
>-	cl->format.blueMax = 0xff;
>+	if(t->m_image.width() != cl->width &&
>+            t->m_image.height() != cl->height)
>+    {   
>+        if( t->m_frameBuffer )
>+        {   
>+            // do not leak if we get a new framebuffer size
>+            delete [] t->m_frameBuffer;
>+        }   
>+        t->m_frameBuffer = new uint8_t[size];
>+        t->m_framebufferInitialized = false;
>+        cl->frameBuffer = t->m_frameBuffer;
>+        memset( cl->frameBuffer, '\0', size );
>+        cl->format.bitsPerPixel = 32; 
>+        cl->format.redShift = 16; 
>+        cl->format.greenShift = 8;
>+        cl->format.blueShift = 0;
>+        cl->format.redMax = 0xff;
>+        cl->format.greenMax = 0xff;
>+        cl->format.blueMax = 0xff;
>+    }   
> 
> 	// only use remote cursor for remote control
> 	cl->appData.useRemoteCursor = false;

Actions: View | Diff

Attachments on bug 37269: 6517 | 6548 | 6597 | 6598