[osm2pgsql] 02/03: Add upstream patch to fix segfault due to null pointers in error messages.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit cab7d7740682abffb9f67a6865615ce1509cf8d0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 1 23:09:25 2016 +0200

    Add upstream patch to fix segfault due to null pointers in error messages.
---
 debian/changelog                                   |  2 ++
 ...null-pointers-when-printing-error-message.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 657d14d..44255b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 osm2pgsql (0.90.0+ds-2) UNRELEASED; urgency=medium
 
   * Enable all hardening buildflags.
+  * Add upstream patch to fix segfault due to null pointers in error messages.
+    (closes: #819713)
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 01 Apr 2016 17:07:40 +0200
 
diff --git a/debian/patches/pgsql_execPrepared-check-for-null-pointers-when-printing-error-message.patch b/debian/patches/pgsql_execPrepared-check-for-null-pointers-when-printing-error-message.patch
new file mode 100644
index 0000000..6f43e8f
--- /dev/null
+++ b/debian/patches/pgsql_execPrepared-check-for-null-pointers-when-printing-error-message.patch
@@ -0,0 +1,25 @@
+Origin: https://github.com/openstreetmap/osm2pgsql/commit/c3298d8dba702e1156beaaaa2aed037dba0c1f75
+Bug-Debian: https://bugs.debian.org/819713
+Bug: https://github.com/openstreetmap/osm2pgsql/issues/564
+From 4c579b53c267bba4a5d0ba716ac5320141a739f9 Mon Sep 17 00:00:00 2001
+From: Sarah Hoffmann <lonvia at denofr.de>
+Date: Fri, 1 Apr 2016 22:37:29 +0200
+Subject: pgsql_execPrepared: check for null pointers when printing
+ error message
+
+fixes #564
+---
+ pgsql.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/pgsql.cpp
++++ b/pgsql.cpp
+@@ -127,7 +127,7 @@ PGresult *pgsql_execPrepared( PGconn *sq
+              message += "Arguments were: ";
+             for(int i = 0; i < nParams; i++)
+             {
+-                message += paramValues[i];
++                message += paramValues[i]?paramValues[i]:"<NULL>";
+                 message += ", ";
+             }
+         }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d9f5725
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+pgsql_execPrepared-check-for-null-pointers-when-printing-error-message.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git