summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-26 16:01:57 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-02-01 13:30:57 +0000
commit2606607d6df99b2b3068a781d4abded7c5492917 (patch)
tree264a281b04967351a83c9ffd1eecd2ec717bb337 /include
parent48168ced891de8e4eca6fd1eb490c452534fccd2 (diff)
ofz: tidy up eps preview import
a) check that the remaining stream length is >= the 14 bytes that are unconditionally skipped b) make the initial security count the min of the arbitrary 100 and the remaining stream len less that 14 bytes c) tweak ImplGetNumber not to reduce nSecurityCount if its already 0 Change-Id: Ifffa6d02d492affd578fb48007704457ad635b39 (cherry picked from commit 94ffb720b889c51665ebb789d84aee3b3bacb456) ofz: check eps seeks are sane and succeeded Change-Id: I0eb45e1c1ffd91682ed0ce6a6a74eab54666d715 (cherry picked from commit f85fb724d52a0fff9c64365cd202ae8975492c05) ofz: check if the stream is able to meet the eps len claim before reading Change-Id: I65407bffb67449e203b8ead23554a4e88387d214 (cherry picked from commit e17a34e957c21a8cd2977b1b0e1c9a427c244aed) ofz: check if the stream is able to meet the eps len claim before reading Change-Id: I440c7f38d6588c570a411f2a97c0164e5d7d646f (cherry picked from commit d1f31681623696e99b0bd9e98570cb1ebac518cc) make this a little more readable Change-Id: I83b6b0bd636b639ce0892f22f216410ce79dee03 (cherry picked from commit cf06348d9d4be8b8460d202cebf0d995fd4f6abf) move deref inside (laughable) nSecurityCount check Change-Id: Idf9a83ffa80137967d8c77d7a9b5133529fc2858 (cherry picked from commit 521723b1180a32c02a88ed47137d4242c06eaca7) Reviewed-on: https://gerrit.libreoffice.org/33634 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/sal/log-areas.dox1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index a27e77e566a4..c5cdc3c188db 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -199,6 +199,7 @@ certain functionality.
@section Filter
@li @c filter.config
+@li @c filter.eps
@li @c filter.flash
@li @c filter.ms - escher import/export
@li @c filter.odfflatxml