[Pkg-ocaml-maint-commits] [SCM] omake packaging branch, master, updated. debian/0.9.8.5-3-4-18-g6503605

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 66cd47d6fe9555d3e6de4a447ccbf2cbb58dd1ad
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Apr 11 17:08:28 2009 +0200

    Fix attempt to free a non-heap object (new patch) (Closes: #505045)

diff --git a/debian/patches/0003-Fix-attempt-to-free-a-non-heap-object.patch b/debian/patches/0003-Fix-attempt-to-free-a-non-heap-object.patch
new file mode 100644
index 0000000..76a8da1
--- /dev/null
+++ b/debian/patches/0003-Fix-attempt-to-free-a-non-heap-object.patch
@@ -0,0 +1,51 @@
+From fa11fc5dfb0235883e9f5f7259532537d5b86f3d Mon Sep 17 00:00:00 2001
+From: Martin Michlmayr <tbm at cyrius.com>
+Date: Sat, 11 Apr 2009 17:05:35 +0200
+Subject: [PATCH] Fix attempt to free a non-heap object
+
+Spotted by Martin Michlmayr thanks to a new warning in GCC 4.4.
+See Debian bug #505045.
+
+Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ src/libmojave-external/cutil/lm_printf.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/libmojave-external/cutil/lm_printf.c b/src/libmojave-external/cutil/lm_printf.c
+index dc14927..5d9075d 100644
+--- a/src/libmojave-external/cutil/lm_printf.c
++++ b/src/libmojave-external/cutil/lm_printf.c
+@@ -142,12 +142,12 @@ value ml_print_string(value v_fmt, value v_string)
+ #endif
+     if(code < 0) {
+         if(bufp != buffer)
+-            free(buffer);
++            free(bufp);
+         failwith("ml_print_string");
+     }
+     v_result = copy_string(bufp);
+     if(bufp != buffer)
+-        free(buffer);
++        free(bufp);
+     return v_result;
+ }
+ 
+@@ -190,12 +190,12 @@ value ml_print_string2(value v_width, value v_fmt, value v_string)
+ #endif
+     if(code < 0) {
+         if(bufp != buffer)
+-            free(buffer);
++            free(bufp);
+         failwith("ml_print_string");
+     }
+     v_result = copy_string(bufp);
+     if(bufp != buffer)
+-        free(buffer);
++        free(bufp);
+     return v_result;
+ }
+ 
+-- 
+1.6.2.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 661531d..c105b74 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-stdin-stdout-fix-upstream-r12115.patch
 0002-Remove-useless-sync-external-declaration.patch
+0003-Fix-attempt-to-free-a-non-heap-object.patch

-- 
omake packaging