1From 94fe6eb9ea2691f4a7c32fbf2d0c7c454995b666 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 27 Feb 2020 11:08:57 +0800
4Subject: [PATCH] Fix #587
5
6Off by one error in common.c, CVE-2019-19906.
7
8Thanks to Stephan Zeisberg for reporting
9
10CVE: CVE-2019-19906
11
12Upstream-Stauts: Backport [https://github.com/cyrusimap/cyrus-sasl
13/commit/dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1]
14
15Signed-off-by: Changqing Li <changqing.li@windriver.com>
16---
17 lib/common.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/lib/common.c b/lib/common.c
21index d9104c8..fef82db 100644
22--- a/lib/common.c
23+++ b/lib/common.c
24@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen,
25
26   if (add==NULL) add = "(null)";
27
28-  addlen=strlen(add); /* only compute once */
29+  addlen=strlen(add)+1; /* only compute once */
30   if (_buf_alloc(out, alloclen, (*outlen)+addlen+1)!=SASL_OK)
31     return SASL_NOMEM;
32
33--
342.25.1
35
36