diff options
Diffstat (limited to 'libwpd/libwpd.corruptedprefix.patch')
| -rw-r--r-- | libwpd/libwpd.corruptedprefix.patch | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/libwpd/libwpd.corruptedprefix.patch b/libwpd/libwpd.corruptedprefix.patch deleted file mode 100644 index 9d5288d0515d..000000000000 --- a/libwpd/libwpd.corruptedprefix.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- misc/libwpd-0.9.1/src/lib/WP6PrefixDataPacket.cpp 2010-08-26 13:35:21.000000000 +0200 -+++ misc/build/libwpd-0.9.1/src/lib/WP6PrefixDataPacket.cpp 2011-04-01 18:25:41.328379372 +0200 -@@ -46,45 +46,67 @@ - } - - WP6PrefixDataPacket * WP6PrefixDataPacket::constructPrefixDataPacket(WPXInputStream * input, WPXEncryption *encryption, WP6PrefixIndice *prefixIndice) --{ -- switch (prefixIndice->getType()) -+{ -+ WP6PrefixDataPacket *tmpPacket = 0; -+ try -+ { -+ switch (prefixIndice->getType()) -+ { -+ case WP6_INDEX_HEADER_INITIAL_FONT: -+ tmpPacket = new WP6DefaultInitialFontPacket(input, encryption, prefixIndice->getID(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ case WP6_INDEX_HEADER_GENERAL_WORDPERFECT_TEXT: -+ tmpPacket = new WP6GeneralTextPacket(input, encryption, prefixIndice->getID(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ case WP6_INDEX_HEADER_DESIRED_FONT_DESCRIPTOR_POOL: -+ tmpPacket = new WP6FontDescriptorPacket(input, encryption, prefixIndice->getID(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ case WP6_INDEX_HEADER_FILL_STYLE: -+ tmpPacket = new WP6FillStylePacket(input, encryption, prefixIndice->getID(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ case WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY: -+ tmpPacket = new WP6ExtendedDocumentSummaryPacket(input, encryption, prefixIndice->getID(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ case WP6_INDEX_HEADER_OUTLINE_STYLE: -+ tmpPacket = new WP6OutlineStylePacket(input, encryption, prefixIndice->getID(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ case WP6_INDEX_HEADER_GRAPHICS_FILENAME: -+ tmpPacket = new WP6GraphicsFilenamePacket(input, encryption, prefixIndice->getID(), prefixIndice->getFlags(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ case WP6_INDEX_HEADER_GRAPHICS_CACHED_FILE_DATA: -+ tmpPacket = new WP6GraphicsCachedFileDataPacket(input, encryption, prefixIndice->getID(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ case WP6_INDEX_HEADER_GRAPHICS_BOX_STYLE: -+ tmpPacket = new WP6GraphicsBoxStylePacket(input, encryption, prefixIndice->getID(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ case WP6_INDEX_HEADER_TABLE_STYLE: -+ tmpPacket = new WP6TableStylePacket(input, encryption, prefixIndice->getID(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ case WP6_INDEX_HEADER_COMMENT_ANNOTATION: -+ tmpPacket = new WP6CommentAnnotationPacket(input, encryption, prefixIndice->getID(), -+ prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -+ break; -+ default: -+ break;; -+ } -+ } -+ catch (FileException) - { -- case WP6_INDEX_HEADER_INITIAL_FONT: -- return new WP6DefaultInitialFontPacket(input, encryption, prefixIndice->getID(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- case WP6_INDEX_HEADER_GENERAL_WORDPERFECT_TEXT: -- return new WP6GeneralTextPacket(input, encryption, prefixIndice->getID(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- case WP6_INDEX_HEADER_DESIRED_FONT_DESCRIPTOR_POOL: -- return new WP6FontDescriptorPacket(input, encryption, prefixIndice->getID(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- case WP6_INDEX_HEADER_FILL_STYLE: -- return new WP6FillStylePacket(input, encryption, prefixIndice->getID(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- case WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY: -- return new WP6ExtendedDocumentSummaryPacket(input, encryption, prefixIndice->getID(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- case WP6_INDEX_HEADER_OUTLINE_STYLE: -- return new WP6OutlineStylePacket(input, encryption, prefixIndice->getID(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- case WP6_INDEX_HEADER_GRAPHICS_FILENAME: -- return new WP6GraphicsFilenamePacket(input, encryption, prefixIndice->getID(), prefixIndice->getFlags(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- case WP6_INDEX_HEADER_GRAPHICS_CACHED_FILE_DATA: -- return new WP6GraphicsCachedFileDataPacket(input, encryption, prefixIndice->getID(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- case WP6_INDEX_HEADER_GRAPHICS_BOX_STYLE: -- return new WP6GraphicsBoxStylePacket(input, encryption, prefixIndice->getID(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- case WP6_INDEX_HEADER_TABLE_STYLE: -- return new WP6TableStylePacket(input, encryption, prefixIndice->getID(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- case WP6_INDEX_HEADER_COMMENT_ANNOTATION: -- return new WP6CommentAnnotationPacket(input, encryption, prefixIndice->getID(), -- prefixIndice->getDataOffset(), prefixIndice->getDataSize()); -- default: -- return 0; -+ if (tmpPacket) -+ delete tmpPacket; -+ tmpPacket = 0; - } -+ return tmpPacket; - } - - void WP6PrefixDataPacket::_read(WPXInputStream *input, WPXEncryption *encryption, uint32_t dataOffset, uint32_t dataSize) |