31 lines
886 B
Diff
31 lines
886 B
Diff
|
From 7e0793e15e21f68337e130c67b031ca38edf055f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aymeric Moizard <amoizard@gmail.com>
|
||
|
|
Date: Mon, 5 Sep 2016 15:01:53 +0200
|
||
|
|
Subject: [PATCH] * fix bug report: sr #109133: Heap buffer overflow in
|
||
|
|
utility function *osip_clrncpy* https://savannah.gnu.org/support/?109133
|
||
|
|
|
||
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||
|
|
---
|
||
|
|
src/osipparser2/osip_port.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/osipparser2/osip_port.c b/src/osipparser2/osip_port.c
|
||
|
|
index 0e64147..d8941b0 100644
|
||
|
|
--- a/src/osipparser2/osip_port.c
|
||
|
|
+++ b/src/osipparser2/osip_port.c
|
||
|
|
@@ -1291,8 +1291,10 @@ osip_clrncpy (char *dst, const char *src, size_t len)
|
||
|
|
char *p;
|
||
|
|
size_t spaceless_length;
|
||
|
|
|
||
|
|
- if (src == NULL)
|
||
|
|
+ if (src == NULL || len == 0) {
|
||
|
|
+ *dst = '\0';
|
||
|
|
return NULL;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
/* find the start of relevant text */
|
||
|
|
pbeg = src;
|
||
|
|
--
|
||
|
|
2.11.0
|
||
|
|
|