← Back to branch summary

~ubuntu-branches/ubuntu/wily/nbdkit/wily

« back to all changes in this revision

Viewing changes to debian/patches/0001-Don-t-pass-NULL-pointer-to-asprintf-when-generating-.patch

  • Committer: Package Import Robot
  • Author(s): Hilko Bengen
  • Date: 2014-02-17 19:31:33 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20140217193133-xvmd9uadu73nslod
Tags: 1.1.6-1
* New upstream version
* Split package
* Cherry-picked post-1.1.6-bugfix from upstream git

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-Don-t-pass-NULL-pointer-to-asprintf-when-generating-.patch
 
1
From: "Richard W.M. Jones" <rjones@redhat.com>
 
2
Date: Sun, 16 Feb 2014 12:55:48 +0000
 
3
Subject: Don't pass NULL pointer to asprintf when generating --run command.
 
4
 
 
5
This fixes commit 4ce0dbc3f425e6d609cc6739dac8c23b44b1c61b.
 
6
---
 
7
 src/main.c | 2 +-
 
8
 1 file changed, 1 insertion(+), 1 deletion(-)
 
9
 
 
10
diff --git a/src/main.c b/src/main.c
 
11
index 9c1c2f0..9dcd030 100644
 
12
--- a/src/main.c
 
13
+++ b/src/main.c
 
14
@@ -546,7 +546,7 @@ run_command (void)
 
15
                 "port='%s'\n"
 
16
                 "unixsocket='%s'\n"
 
17
                 "%s",
 
18
-                url, port, unixsocket, run);
 
19
+                url, port ? port : "", unixsocket ? unixsocket : "", run);
 
20
   if (r == -1) {
 
21
     perror ("asprintf");
 
22
     exit (EXIT_FAILURE);