diff --git a/libcli/util/hresult.c b/libcli/util/hresult.c
index 1b3a8f2b690..327d97b7c1e 100644
--- a/libcli/util/hresult.c
+++ b/libcli/util/hresult.c
@@ -14688,7 +14688,7 @@ const char *hresult_errstr_const(HRESULT err_code)
 
 const char *hresult_errstr(HRESULT err_code)
 {
-	static char msg[20];
+	static char msg[22];
 	int i;
 
 	for (i = 0; i < ARRAY_SIZE(hresult_errs); i++) {
diff --git a/source4/scripting/bin/gen_hresult.py b/source4/scripting/bin/gen_hresult.py
index d49aef9a0b4..cdc9142e56b 100755
--- a/source4/scripting/bin/gen_hresult.py
+++ b/source4/scripting/bin/gen_hresult.py
@@ -186,7 +186,7 @@ def generateSourceFile(out_file):
     out_file.write("\n")
     out_file.write("const char *hresult_errstr(HRESULT err_code)\n")
     out_file.write("{\n");
-    out_file.write("	static char msg[20];\n")
+    out_file.write("	static char msg[22];\n")
     out_file.write("	int i;\n")
     out_file.write("\n")
     out_file.write("	for (i = 0; i < ARRAY_SIZE(hresult_errs); i++) {\n")