From 6803be309c1e83e4048aaf3783a0f33471b43441 Mon Sep 17 00:00:00 2001 From: Thilo Raufeisen Date: Tue, 24 Oct 2006 14:04:02 +0000 Subject: [PATCH] - fixed build-issues in config.m4 - make sure that 'plain_text' is passed on 'verify' - set error_reporting to E_ALL during tests --- config.m4 | 2 +- gnupg.c | 2 +- tests/vars.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.m4 b/config.m4 index 62508bb..f7d1873 100644 --- a/config.m4 +++ b/config.m4 @@ -24,7 +24,7 @@ if test "$PHP_GNUPG" != "no"; then AC_MSG_ERROR([Please reinstall the gpgme distribution]) fi - PHP_ADD_INCLUDE($GNUPG_DIR/include) + PHP_ADD_INCLUDE($GNUPG_DIR) LIBNAME=gpgme LIBSYMBOL=gpgme_check_version diff --git a/gnupg.c b/gnupg.c index 430b75e..4555950 100644 --- a/gnupg.c +++ b/gnupg.c @@ -1162,7 +1162,7 @@ PHP_FUNCTION(gnupg_verify){ gnupg_fetchsignatures (gpgme_result->signatures,signature_array,return_value); /* get a 'plain' version of the text without a signature */ gpg_plain = gpgme_data_release_and_get_mem(gpgme_text,&gpg_plain_len); - if(gpg_plain && gpg_plain_len > 0){ + if(gpg_plain && gpg_plain_len > 0 && plain_text){ ZVAL_STRINGL (plain_text, gpg_plain,gpg_plain_len,1); } free (gpg_plain); diff --git a/tests/vars.inc b/tests/vars.inc index 53551d0..1d4de35 100644 --- a/tests/vars.inc +++ b/tests/vars.inc @@ -1,6 +1,6 @@