summaryrefslogtreecommitdiffstats
path: root/13.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-07-31 10:42:07 +0200
committerRemi Collet <remi@php.net>2025-07-31 10:42:07 +0200
commitc1503b10626b78b063996e8b58b654373b05b13a (patch)
treed0209ec31452a9f515034411ea6009ec2822f577 /13.patch
parentad922b9a6cad49ebcae8a29e08fee61e45aac067 (diff)
fix behavior change with librnp 0.18 using patch fromHEADmaster
https://github.com/rnpgp/php-rnp/pull/11 fix segfault in php_rnp_password_callback using patch from https://github.com/rnpgp/php-rnp/pull/13 re-license spec file to CECILL-2.1
Diffstat (limited to '13.patch')
-rw-r--r--13.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/13.patch b/13.patch
new file mode 100644
index 0000000..6f94de7
--- /dev/null
+++ b/13.patch
@@ -0,0 +1,22 @@
+From 570e2f865370a74cbffa95d2bbe1a440b60413fe Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 31 Jul 2025 10:24:18 +0200
+Subject: [PATCH] Fix #12 segfault in php_rnp_password_callback
+
+---
+ rnp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rnp.c b/rnp.c
+index 0a41e03..28c4ccc 100644
+--- a/rnp.c
++++ b/rnp.c
+@@ -592,7 +592,7 @@ static bool php_rnp_password_callback(rnp_ffi_t ffi,
+ }
+
+ ZVAL_NULL(&retval);
+- ZVAL_STRINGL(&passwordval, buf, buf_len);
++ ZVAL_EMPTY_STRING(&passwordval);
+
+ if (key) {
+ ret = rnp_key_get_fprint(key, &key_fp);