[med-svn] [conquest-dicom-server] 02/14: Patch dgate.cpp to avoid uninitialized variables.

[Pablo Lorenzzoni]

This is an automated email from the git hooks/post-receive script.

spectra pushed a commit to branch master
in repository conquest-dicom-server.

commit b03696b161b7c038595349a00328eefe8e7de4d8
Author: Pablo Lorenzzoni <spectra at debian.org>
Date:   Wed Feb 5 16:58:50 2014 -0200

    Patch dgate.cpp to avoid uninitialized variables.
---
 debian/patches/0013-Fix-cppcheck-bugs-8-e-9.patch | 42 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 43 insertions(+)

diff --git a/debian/patches/0013-Fix-cppcheck-bugs-8-e-9.patch b/debian/patches/0013-Fix-cppcheck-bugs-8-e-9.patch
new file mode 100644
index 0000000..d238164
--- /dev/null
+++ b/debian/patches/0013-Fix-cppcheck-bugs-8-e-9.patch
@@ -0,0 +1,42 @@
+From: Pablo Lorenzzoni <spectra at debian.org>
+Date: Wed, 5 Feb 2014 16:57:49 -0200
+Subject: Fix cppcheck bugs #8 e #9
+
+[dgate.cpp:5985]: (error) Uninitialized variable: f
+[dgate.cpp:6422]: (error) Uninitialized variable: owned
+---
+ dgate.cpp |   13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/dgate.cpp b/dgate.cpp
+index ff462b2..ea22a30 100644
+--- a/dgate.cpp
++++ b/dgate.cpp
+@@ -5983,13 +5983,12 @@ extern "C"
+     { f = DB.Exec(sql);
+       DB.Close();
+       QueryFromGui++;
++      if (f)
++      { lua_pushinteger(L, 1);
++        return 1;
++      }
+     }
+-    if (f)
+-    { lua_pushinteger(L, 1);
+-      return 1;
+-    }
+-    else
+-      return 0;
++    return 0;
+   }
+   static int luadicomquery(lua_State *L)
+   { const char *ae    = lua_tostring(L,1);
+@@ -6410,7 +6409,7 @@ extern "C"
+   static int luadeletedicomobject(lua_State *L)
+   { struct scriptdata *sd = getsd(L);
+     DICOMDataObject *O = NULL;
+-    int owned;
++    int owned = 0;
+     Array < DICOMDataObject * > *A = NULL;
+     if (lua_isuserdata(L,1)) 
+     { lua_getmetatable(L, 1);
diff --git a/debian/patches/series b/debian/patches/series
index 9ebc147..628672d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0010-Fix-cppcheck-bug-3-and-others-in-same-function.patch
 0011-Fix-cppcheck-bug-4.patch
 0012-Fix-cppcheck-bug-5.5.patch
+0013-Fix-cppcheck-bugs-8-e-9.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git