diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2021-10-01 17:42:09 +0200 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-03-09 19:00:30 +0100 |
commit | 59f4780a113bd7bf8cbec08f3ec30c7f620e0b88 (patch) | |
tree | 5c494ddea65ddd6a673d70f249bb8c7281222b54 /external | |
parent | 0a36fd14f66b0f31ee3257217ab08de1475bec61 (diff) |
curl: patch invalid format string in debug log
This causes:
soffice.bin: sendf.c:243: Curl_infof: Assertion `!strchr(fmt, '\n')' failed.
Change-Id: I5a78b2225f6769cc49025e1e73ce72cd3d6bec16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122963
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 68a3df2f1282f40fa4accaed21a69a84d76be37d)
Diffstat (limited to 'external')
-rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 1 | ||||
-rw-r--r-- | external/curl/curl-debug.patch.1 | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 1cdb64c0bca2..46848ae79ae0 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\ external/curl/curl-msvc-disable-protocols.patch.1 \ external/curl/curl-7.26.0_win-proxy.patch \ external/curl/zlib.patch.0 \ + external/curl/curl-debug.patch.1 \ )) ifeq ($(SYSTEM_NSS),) diff --git a/external/curl/curl-debug.patch.1 b/external/curl/curl-debug.patch.1 new file mode 100644 index 000000000000..a000913ed335 --- /dev/null +++ b/external/curl/curl-debug.patch.1 @@ -0,0 +1,11 @@ +--- curl/lib/vtls/nss.c.orig 2021-10-01 17:34:59.302663021 +0200 ++++ curl/lib/vtls/nss.c 2021-10-01 17:35:55.376666010 +0200 +@@ -955,7 +955,7 @@ + subject = CERT_NameToAscii(&cert->subject); + issuer = CERT_NameToAscii(&cert->issuer); + common_name = CERT_GetCommonName(&cert->subject); +- infof(data, "subject: %s\n", subject); ++ infof(data, "subject: %s", subject); + + CERT_GetCertTimes(cert, ¬Before, ¬After); + PR_ExplodeTime(notBefore, PR_GMTParameters, &printableTime); |