marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

windowscodecs: GIF decoder should add header and trailer to extension blocks. 

Metadata readers now have access to complete and correctly formatted data
stream.
oldstable
Dmitry Timoshkov 2012-09-18 12:59:50 +09:00 committed by Alexandre Julliard
parent aaa682950d
commit 4786472879
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/windowscodecs/gifformat.c
View File

@ -857,8 +857,8 @@ static const void *get_GCE_data(GifFrameDecode *This)
for (i = 0; i < This->frame->Extensions.ExtensionBlockCount; i++)
{
if (This->frame->Extensions.ExtensionBlocks[i].Function == GRAPHICS_EXT_FUNC_CODE &&
This->frame->Extensions.ExtensionBlocks[i].ByteCount == 4)
return This->frame->Extensions.ExtensionBlocks[i].Bytes;
This->frame->Extensions.ExtensionBlocks[i].ByteCount == 8)
return This->frame->Extensions.ExtensionBlocks[i].Bytes + 3;
}
return NULL;
}

19
dlls/windowscodecs/ungif.c
View File

@ -209,13 +209,18 @@ AddExtensionBlock(Extensions *New,
ep = &New->ExtensionBlocks[New->ExtensionBlockCount++];
ep->ByteCount=Len;
ep->Bytes = ungif_alloc(ep->ByteCount);
ep->ByteCount=Len + 3;
ep->Bytes = ungif_alloc(ep->ByteCount + 3);
if (ep->Bytes == NULL)
return (GIF_ERROR);
/* Extension Header */
ep->Bytes[0] = 0x21;
ep->Bytes[1] = New->Function;
ep->Bytes[2] = Len;
if (ExtData) {
memcpy(ep->Bytes, ExtData, Len);
memcpy(ep->Bytes + 3, ExtData, Len);
ep->Function = New->Function;
}
@ -238,12 +243,12 @@ AppendExtensionBlock(Extensions *New,
if (ep->Bytes == NULL)
return (GIF_ERROR);
ep->Bytes[ep->ByteCount] = Len;
if (ExtData)
{
ep->Bytes[ep->ByteCount] = Len;
memcpy(ep->Bytes + ep->ByteCount + 1, ExtData, Len);
ep->ByteCount += Len + 1;
}
ep->ByteCount += Len + 1;
return (GIF_OK);
}