Mercurial > hg > orthanc-wsi
changeset 85:8a20cd67b283
missing file
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 15 Dec 2016 15:37:40 +0100 |
| parents | 727670c5c125 |
| children | 319b8c45c231 |
| files | Resources/Orthanc/Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch Resources/SyncOrthancFolder.py |
| diffstat | 2 files changed, 30 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/Orthanc/Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch Thu Dec 15 15:37:40 2016 +0100 @@ -0,0 +1,29 @@ +diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dulparse.cc dcmtk-3.6.0/dcmnet/libsrc/dulparse.cc +--- dcmtk-3.6.0.orig/dcmnet/libsrc/dulparse.cc 2010-12-01 09:26:36.000000000 +0100 ++++ dcmtk-3.6.0/dcmnet/libsrc/dulparse.cc 2016-12-02 15:58:49.930540033 +0100 +@@ -393,6 +393,8 @@ + return cond; + + buf += length; ++ if (presentationLength < length) ++ return EC_MemoryExhausted; + presentationLength -= length; + DCMNET_TRACE("Successfully parsed Abstract Syntax"); + break; +@@ -404,12 +406,16 @@ + cond = LST_Enqueue(&context->transferSyntaxList, (LST_NODE*)subItem); + if (cond.bad()) return cond; + buf += length; ++ if (presentationLength < length) ++ return EC_MemoryExhausted; + presentationLength -= length; + DCMNET_TRACE("Successfully parsed Transfer Syntax"); + break; + default: + cond = parseDummy(buf, &length, presentationLength); + buf += length; ++ if (presentationLength < length) ++ return EC_MemoryExhausted; + presentationLength -= length; + break; + }
--- a/Resources/SyncOrthancFolder.py Thu Dec 15 12:36:20 2016 +0100 +++ b/Resources/SyncOrthancFolder.py Thu Dec 15 15:37:40 2016 +0100 @@ -121,6 +121,7 @@ 'Resources/MinGW-W64-Toolchain32.cmake', 'Resources/MinGW-W64-Toolchain64.cmake', 'Resources/MinGWToolchain.cmake', + 'Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch', 'Resources/Patches/dcmtk-3.6.0-mingw64.patch', 'Resources/Patches/dcmtk-3.6.0-speed.patch', 'Resources/Patches/dcmtk-3.6.1-speed.patch',