0004-Fixed-two-segmentation-faults.patch: unfuzz.

diff --git a/debian/patches/0004-Fixed-two-segmentation-faults.patch b/debian/patches/0004-Fixed-two-segmentation-faults.patch
index f86587347bb7724c16f7cfeea873bd965ab01329..ab6bb30d0226b7dc22ef7bedab2389b3427720ab 100644 (file)
--- a/debian/patches/0004-Fixed-two-segmentation-faults.patch
+++ b/debian/patches/0004-Fixed-two-segmentation-faults.patch
@@ -15,10 +15,8 @@ This closes DCMTK issue #1114.
  dcmnet/libsrc/dimcmd.cc  | 33 ++++++++++++++++++---------------
  2 files changed, 26 insertions(+), 16 deletions(-)
 
-diff --git a/dcmdata/libsrc/dcelem.cc b/dcmdata/libsrc/dcelem.cc
-index 1524904be..3b9cc2bf7 100644
---- a/dcmdata/libsrc/dcelem.cc
-+++ b/dcmdata/libsrc/dcelem.cc
+--- dcmtk.orig/dcmdata/libsrc/dcelem.cc
++++ dcmtk/dcmdata/libsrc/dcelem.cc
 @@ -1,6 +1,6 @@
  /*
   *
@@ -27,7 +25,7 @@ index 1524904be..3b9cc2bf7 100644
   *  All rights reserved.  See COPYRIGHT file for details.
   *
   *  This software and supporting documentation were developed by
-@@ -717,6 +717,13 @@ OFCondition DcmElement::loadValue(DcmInputStream *inStream)
+@@ -717,6 +717,13 @@
              if (isStreamNew)
                  delete readStream;
          }
@@ -41,10 +39,8 @@ index 1524904be..3b9cc2bf7 100644
      }
      /* return result value */
      return errorFlag;
-diff --git a/dcmnet/libsrc/dimcmd.cc b/dcmnet/libsrc/dimcmd.cc
-index 6dca39546..ffd225f4b 100644
---- a/dcmnet/libsrc/dimcmd.cc
-+++ b/dcmnet/libsrc/dimcmd.cc
+--- dcmtk.orig/dcmnet/libsrc/dimcmd.cc
++++ dcmtk/dcmnet/libsrc/dimcmd.cc
 @@ -1,6 +1,6 @@
  /*
   *
@@ -53,7 +49,7 @@ index 6dca39546..ffd225f4b 100644
   *  All rights reserved.  See COPYRIGHT file for details.
   *
   *  This software and supporting documentation were partly developed by
-@@ -205,22 +205,25 @@ getString(DcmDataset *obj, DcmTagKey t, char *s, int maxlen, OFBool *spacePadded
+@@ -207,22 +207,25 @@
              return parseErrorWithMsg("dimcmd:getString: string too small", t);
          } else {
              ec =  elem->getString(aString);