[pen] Correct the syntax of snprintf()

Christopher Meng cicku at fedoraproject.org
Thu Apr 3 01:16:16 UTC 2014


commit 550848968e0fc96a35a12ec7bb861c31d213aee6
Author: Christopher Meng <i at cicku.me>
Date:   Wed Apr 2 18:14:23 2014 +0800

    Correct the syntax of snprintf()

 pen-0.22.0-gcc-format-security-fix.patch |    4 ++--
 pen.spec                                 |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/pen-0.22.0-gcc-format-security-fix.patch b/pen-0.22.0-gcc-format-security-fix.patch
index a030e92..45d2f87 100644
--- a/pen-0.22.0-gcc-format-security-fix.patch
+++ b/pen-0.22.0-gcc-format-security-fix.patch
@@ -6,7 +6,7 @@ diff -uN pen-0.22.0.orig/pen.c pen-0.22.0/pen.c
  	memset(&serv_addr, 0, sizeof serv_addr);
  	serv_addr.sun_family = AF_UNIX;
 -	snprintf(serv_addr.sun_path, sizeof serv_addr.sun_path, a);
-+	snprintf("%s", serv_addr.sun_path, sizeof serv_addr.sun_path, a);
++	snprintf(serv_addr.sun_path, sizeof serv_addr.sun_path, "%s", a);
  	if ((listenfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
  		error("can't open stream socket");
  	}
@@ -18,7 +18,7 @@ diff -uN pen-0.22.0.orig/penctl.c pen-0.22.0/penctl.c
  	memset(&serv_addr, 0, sizeof serv_addr);
  	serv_addr.sun_family = AF_UNIX;
 -	snprintf(serv_addr.sun_path, sizeof serv_addr.sun_path, path);
-+	snprintf("%s", serv_addr.sun_path, sizeof serv_addr.sun_path, path);
++	snprintf(serv_addr.sun_path, sizeof serv_addr.sun_path, "%s", path);
  	n = connect(fd, (struct sockaddr *)&serv_addr, sizeof serv_addr);
  	if (n == -1) {
  		error("error connecting to server");
diff --git a/pen.spec b/pen.spec
index cd4256d..7c0413c 100644
--- a/pen.spec
+++ b/pen.spec
@@ -1,6 +1,6 @@
 Name:           pen
 Version:        0.22.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Load balancer for "simple" tcp based protocols such as http or smtp
 License:        GPLv2
 URL:            http://siag.nu/pen/
@@ -49,6 +49,9 @@ install -pDm0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/pen.conf
 %exclude %{_prefix}/doc/
 
 %changelog
+* Wed Apr 02 2014 Christopher Meng <rpm at cicku.me> - 0.22.0-2
+- Patch messed with syntax.
+
 * Tue Apr 01 2014 Christopher Meng <rpm at cicku.me> - 0.22.0-1
 - Update to 0.22.0
 - Built with GeoIP support.


More information about the scm-commits mailing list