From 763b69a85a353b9c9983eebdd7b8833b87669071 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Apr 23 2020 11:15:17 +0000 Subject: Fix patch to correctly terminate strings --- diff --git a/0001-Fix-stringop-truncation-error-thanks-DJ-Delorie.patch b/0001-Fix-stringop-truncation-error-thanks-DJ-Delorie.patch index 932fb48..de96053 100644 --- a/0001-Fix-stringop-truncation-error-thanks-DJ-Delorie.patch +++ b/0001-Fix-stringop-truncation-error-thanks-DJ-Delorie.patch @@ -18,23 +18,23 @@ diff --git a/src/irc.c b/src/irc.c index 8163f32..98345aa 100644 --- a/src/irc.c +++ b/src/irc.c -@@ -631,8 +631,7 @@ static char *get_str_elem(char *str, int num) +@@ -634,7 +634,7 @@ static char *get_str_elem(char *str, int num) if (c - cur < 1) return NULL; ret = bip_malloc(c - cur + 1); - strncpy(ret, cur, c - cur); -- ret[c - cur] = 0; -+ strncpy (ret, cur, c - cur + 1); ++ memcpy(ret, cur, c - cur); + ret[c - cur] = 0; return ret; } if (index == num) { -@@ -640,8 +639,7 @@ static char *get_str_elem(char *str, int num) +@@ -643,7 +643,7 @@ static char *get_str_elem(char *str, int num) if (c - cur < 1) return NULL; ret = bip_malloc(c - cur + 1); - strncpy(ret, cur, c - cur); -- ret[c - cur] = 0; -+ strncpy (ret, cur, c - cur + 1); ++ memcpy(ret, cur, c - cur); + ret[c - cur] = 0; return ret; } return NULL; diff --git a/bip.spec b/bip.spec index bc40ea0..50a8e43 100644 --- a/bip.spec +++ b/bip.spec @@ -5,7 +5,7 @@ Name: bip Version: 0.9.0 -Release: 0.6.%{date}git%{shortcommit}%{?dist} +Release: 0.7.%{date}git%{shortcommit}%{?dist} Summary: IRC Bouncer License: GPLv2+ URL: http://bip.t1r.net @@ -119,6 +119,9 @@ install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/ %{_unitdir}/bip.service %changelog +* Thu Apr 23 2020 Tom Hughes - 0.9.0-0.7.20181225gitc9cc64f +- Fix patch to correctly terminate strings + * Fri Feb 07 2020 Adam Williamson - 0.9.0-0.6.20181225gitc9cc64f - Fix a build failure on Rawhide (thanks DJ Delorie)