Mercurial > hg > orthanc

annotate Resources/Patches/dcmtk-3.6.0-dulparse-vulnerability.patch @ 3349:ef18ea68a362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <alain@mazy.be>
date Thu, 18 Apr 2019 15:52:56 +0200
parents 6ac6193a7935
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2193
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dulparse.cc dcmtk-3.6.0/dcmnet/libsrc/dulparse.cc
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- dcmtk-3.6.0.orig/dcmnet/libsrc/dulparse.cc 2010-12-01 09:26:36.000000000 +0100
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ dcmtk-3.6.0/dcmnet/libsrc/dulparse.cc 2016-12-02 15:58:49.930540033 +0100
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -393,6 +393,8 @@
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 return cond;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 buf += length;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 + if (presentationLength < length)
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 + return EC_MemoryExhausted;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 presentationLength -= length;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 DCMNET_TRACE("Successfully parsed Abstract Syntax");
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 break;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 @@ -404,12 +406,16 @@
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 cond = LST_Enqueue(&context->transferSyntaxList, (LST_NODE*)subItem);
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 if (cond.bad()) return cond;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 buf += length;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 + if (presentationLength < length)
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 + return EC_MemoryExhausted;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 presentationLength -= length;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 DCMNET_TRACE("Successfully parsed Transfer Syntax");
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 break;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 default:
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 cond = parseDummy(buf, &length, presentationLength);
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 buf += length;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 + if (presentationLength < length)
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 + return EC_MemoryExhausted;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 presentationLength -= length;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 break;
6ac6193a7935 fix a vulnerability in dcmtk 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 }