diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index b1f6d39171e..cec38aa3353 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -414,7 +414,7 @@ void phar_entry_delref(phar_entry_data *idata) /* {{{ */
 /**
  * Removes an entry, either by actually removing it or by marking it.
  */
-void phar_entry_remove(phar_entry_data *idata, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL void phar_entry_remove(phar_entry_data *idata, char **error) /* {{{ */
 {
 	phar_archive_data *phar;
 
@@ -1310,7 +1310,7 @@ static zend_result phar_parse_pharfile(php_stream *fp, char *fname, size_t fname
 /**
  * Create or open a phar for writing
  */
-zend_result phar_open_or_create_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_open_or_create_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
 {
 	const char *ext_str, *z;
 	char *my_error;
@@ -1319,9 +1319,7 @@ zend_result phar_open_or_create_filename(char *fname, size_t fname_len, char *al
 
 	test = &unused;
 
-	if (error) {
-		*error = NULL;
-	}
+	*error = NULL;
 
 	/* first try to open an existing file */
 	if (phar_detect_phar_fname_ext(fname, fname_len, &ext_str, &ext_len, !is_data, 0, true) == SUCCESS) {
@@ -1330,25 +1328,19 @@ zend_result phar_open_or_create_filename(char *fname, size_t fname_len, char *al
 
 	/* next try to create a new file */
 	if (FAILURE == phar_detect_phar_fname_ext(fname, fname_len, &ext_str, &ext_len, !is_data, 1, true)) {
-		if (error) {
-			if (ext_len == -2) {
-				spprintf(error, 0, "Cannot create a phar archive from a URL like \"%s\". Phar objects can only be created from local files", fname);
-			} else {
-				spprintf(error, 0, "Cannot create phar '%s', file extension (or combination) not recognised or the directory does not exist", fname);
-			}
+		if (ext_len == -2) {
+			spprintf(error, 0, "Cannot create a phar archive from a URL like \"%s\". Phar objects can only be created from local files", fname);
+		} else {
+			spprintf(error, 0, "Cannot create phar '%s', file extension (or combination) not recognised or the directory does not exist", fname);
 		}
 		return FAILURE;
 	}
 check_file:
 	if (phar_open_parsed_phar(fname, fname_len, alias, alias_len, is_data, options, test, &my_error) == SUCCESS) {
-		if (pphar) {
-			*pphar = *test;
-		}
+		*pphar = *test;
 
 		if ((*test)->is_data && !(*test)->is_tar && !(*test)->is_zip) {
-			if (error) {
-				spprintf(error, 0, "Cannot open '%s' as a PharData object. Use Phar::__construct() for executable archives", fname);
-			}
+			spprintf(error, 0, "Cannot open '%s' as a PharData object. Use Phar::__construct() for executable archives", fname);
 			return FAILURE;
 		}
 
@@ -1364,11 +1356,7 @@ check_file:
 		}
 		return SUCCESS;
 	} else if (my_error) {
-		if (error) {
-			*error = my_error;
-		} else {
-			efree(my_error);
-		}
+		*error = my_error;
 		return FAILURE;
 	}
 
@@ -1388,16 +1376,12 @@ check_file:
 
 static zend_result phar_open_from_fp(php_stream* fp, char *fname, size_t fname_len, char *alias, size_t alias_len, uint32_t options, phar_archive_data** pphar, char **error);
 
-zend_result phar_create_or_parse_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_create_or_parse_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
 {
-	phar_archive_data *mydata;
 	php_stream *fp;
 	zend_string *actual = NULL;
 	char *p;
 
-	if (!pphar) {
-		pphar = &mydata;
-	}
 	if (php_check_open_basedir(fname)) {
 		return FAILURE;
 	}
@@ -1434,15 +1418,13 @@ zend_result phar_create_or_parse_filename(char *fname, size_t fname_len, char *a
 
 	if (PHAR_G(readonly) && !is_data) {
 		if (options & REPORT_ERRORS) {
-			if (error) {
-				spprintf(error, 0, "creating archive \"%s\" disabled by the php.ini setting phar.readonly", fname);
-			}
+			spprintf(error, 0, "creating archive \"%s\" disabled by the php.ini setting phar.readonly", fname);
 		}
 		return FAILURE;
 	}
 
 	/* set up our manifest */
-	mydata = ecalloc(1, sizeof(phar_archive_data));
+	phar_archive_data *mydata = ecalloc(1, sizeof(phar_archive_data));
 	mydata->fname = expand_filepath(fname, NULL);
 	if (mydata->fname == NULL) {
 		efree(mydata);
@@ -1464,10 +1446,6 @@ zend_result phar_create_or_parse_filename(char *fname, size_t fname_len, char *a
 		}
 	}
 
-	if (pphar) {
-		*pphar = mydata;
-	}
-
 	zend_hash_init(&mydata->manifest, sizeof(phar_entry_info),
 		zend_get_hash_value, destroy_phar_manifest_entry, 0);
 	zend_hash_init(&mydata->mounted_dirs, sizeof(char *),
@@ -1494,15 +1472,11 @@ zend_result phar_create_or_parse_filename(char *fname, size_t fname_len, char *a
 
 		if (alias && NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len))) {
 			if (SUCCESS != phar_free_alias(fd_ptr, alias, alias_len)) {
-				if (error) {
-					spprintf(error, 4096, "phar error: phar \"%s\" cannot set alias \"%s\", already in use by another phar archive", mydata->fname, alias);
-				}
+				spprintf(error, 4096, "phar error: phar \"%s\" cannot set alias \"%s\", already in use by another phar archive", mydata->fname, alias);
 
 				zend_hash_str_del(&(PHAR_G(phar_fname_map)), mydata->fname, fname_len);
 
-				if (pphar) {
-					*pphar = NULL;
-				}
+				*pphar = NULL;
 
 				return FAILURE;
 			}
@@ -1516,21 +1490,18 @@ zend_result phar_create_or_parse_filename(char *fname, size_t fname_len, char *a
 	if (alias_len && alias) {
 		if (NULL == zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len, mydata)) {
 			if (options & REPORT_ERRORS) {
-				if (error) {
-					spprintf(error, 0, "archive \"%s\" cannot be associated with alias \"%s\", already in use", fname, alias);
-				}
+				spprintf(error, 0, "archive \"%s\" cannot be associated with alias \"%s\", already in use", fname, alias);
 			}
 
 			zend_hash_str_del(&(PHAR_G(phar_fname_map)), mydata->fname, fname_len);
 
-			if (pphar) {
-				*pphar = NULL;
-			}
+			*pphar = NULL;
 
 			return FAILURE;
 		}
 	}
 
+	*pphar = mydata;
 	return SUCCESS;
 }
 /* }}}*/
@@ -2320,29 +2291,23 @@ zend_result phar_split_fname(const char *filename, size_t filename_len, char **a
  * Invoked when a user calls Phar::mapPhar() from within an executing .phar
  * to set up its manifest directly
  */
-zend_result phar_open_executed_filename(char *alias, size_t alias_len, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL_ARGS(3) zend_result phar_open_executed_filename(char *alias, size_t alias_len, char **error) /* {{{ */
 {
-	if (error) {
-		*error = NULL;
-	}
+	*error = NULL;
 
 	zend_string *fname = zend_get_executed_filename_ex();
 
 	if (!fname) {
-		if (error) {
-			spprintf(error, 0, "cannot initialize a phar outside of PHP execution");
-		}
+		*error = estrdup("cannot initialize a phar outside of PHP execution");
 		return FAILURE;
 	}
 
-	if (phar_open_parsed_phar(ZSTR_VAL(fname), ZSTR_LEN(fname), alias, alias_len, false, REPORT_ERRORS, NULL, 0) == SUCCESS) {
+	if (phar_open_parsed_phar(ZSTR_VAL(fname), ZSTR_LEN(fname), alias, alias_len, false, REPORT_ERRORS, NULL, NULL) == SUCCESS) {
 		return SUCCESS;
 	}
 
-	if (0 == zend_get_constant_str("__COMPILER_HALT_OFFSET__", sizeof("__COMPILER_HALT_OFFSET__")-1)) {
-		if (error) {
-			spprintf(error, 0, "__HALT_COMPILER(); must be declared in a phar");
-		}
+	if (NULL == zend_get_constant_str("__COMPILER_HALT_OFFSET__", sizeof("__COMPILER_HALT_OFFSET__")-1)) {
+		*error = estrdup("__HALT_COMPILER(); must be declared in a phar");
 		return FAILURE;
 	}
 
@@ -2355,9 +2320,7 @@ zend_result phar_open_executed_filename(char *alias, size_t alias_len, char **er
 	fp = php_stream_open_wrapper(ZSTR_VAL(fname), "rb", IGNORE_URL|STREAM_MUST_SEEK|REPORT_ERRORS, &actual);
 
 	if (!fp) {
-		if (error) {
-			spprintf(error, 0, "unable to open phar for reading \"%s\"", ZSTR_VAL(fname));
-		}
+		spprintf(error, 0, "unable to open phar for reading \"%s\"", ZSTR_VAL(fname));
 		if (actual) {
 			zend_string_release_ex(actual, 0);
 		}
@@ -2381,14 +2344,12 @@ zend_result phar_open_executed_filename(char *alias, size_t alias_len, char **er
 /**
  * Validate the CRC32 of a file opened from within the phar
  */
-zend_result phar_postprocess_file(phar_entry_data *idata, uint32_t crc32, char **error, int process_zip) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL zend_result phar_postprocess_file(phar_entry_data *idata, uint32_t crc32, char **error, int process_zip) /* {{{ */
 {
 	php_stream *fp = idata->fp;
 	phar_entry_info *entry = idata->internal_file;
 
-	if (error) {
-		*error = NULL;
-	}
+	*error = NULL;
 
 	if (entry->is_zip && process_zip > 0) {
 		/* verify local file header */
@@ -2396,14 +2357,15 @@ zend_result phar_postprocess_file(phar_entry_data *idata, uint32_t crc32, char *
 		phar_zip_data_desc desc;
 
 		if (SUCCESS != phar_open_archive_fp(idata->phar)) {
-			spprintf(error, 0, "phar error: unable to open zip-based phar archive \"%s\" to verify local file header for file \"%s\"", idata->phar->fname, ZSTR_VAL(entry->filename));
+			spprintf(error, 0, "phar error: unable to open zip-based phar archive \"%s\" to verify local file header for file \"%s\"",
+				idata->phar->fname, ZSTR_VAL(entry->filename));
 			return FAILURE;
 		}
 		php_stream_seek(phar_get_entrypfp(idata->internal_file), entry->header_offset, SEEK_SET);
 
 		if (sizeof(local) != php_stream_read(phar_get_entrypfp(idata->internal_file), (char *) &local, sizeof(local))) {
-
-			spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (cannot read local file header for file \"%s\")", idata->phar->fname, ZSTR_VAL(entry->filename));
+			spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (cannot read local file header for file \"%s\")",
+				idata->phar->fname, ZSTR_VAL(entry->filename));
 			return FAILURE;
 		}
 
@@ -2416,7 +2378,8 @@ zend_result phar_postprocess_file(phar_entry_data *idata, uint32_t crc32, char *
 					entry->compressed_filesize, SEEK_SET);
 			if (sizeof(desc) != php_stream_read(phar_get_entrypfp(idata->internal_file),
 							    (char *) &desc, sizeof(desc))) {
-				spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (cannot read local data descriptor for file \"%s\")", idata->phar->fname, ZSTR_VAL(entry->filename));
+				spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (cannot read local data descriptor for file \"%s\")",
+					idata->phar->fname, ZSTR_VAL(entry->filename));
 				return FAILURE;
 			}
 			if (desc.signature[0] == 'P' && desc.signature[1] == 'K') {
@@ -2428,7 +2391,8 @@ zend_result phar_postprocess_file(phar_entry_data *idata, uint32_t crc32, char *
 		}
 		/* verify local header */
 		if (ZSTR_LEN(entry->filename) != PHAR_ZIP_16(local.filename_len) || entry->crc32 != PHAR_ZIP_32(local.crc32) || entry->uncompressed_filesize != PHAR_ZIP_32(local.uncompsize) || entry->compressed_filesize != PHAR_ZIP_32(local.compsize)) {
-			spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (local header of file \"%s\" does not match central directory)", idata->phar->fname, ZSTR_VAL(entry->filename));
+			spprintf(error, 0, "phar error: internal corruption of zip-based phar \"%s\" (local header of file \"%s\" does not match central directory)",
+				idata->phar->fname, ZSTR_VAL(entry->filename));
 			return FAILURE;
 		}
 
@@ -2456,7 +2420,8 @@ zend_result phar_postprocess_file(phar_entry_data *idata, uint32_t crc32, char *
 		entry->is_crc_checked = 1;
 		return SUCCESS;
 	} else {
-		spprintf(error, 0, "phar error: internal corruption of phar \"%s\" (crc32 mismatch on file \"%s\")", idata->phar->fname, ZSTR_VAL(entry->filename));
+		spprintf(error, 0, "phar error: internal corruption of phar \"%s\" (crc32 mismatch on file \"%s\")",
+			idata->phar->fname, ZSTR_VAL(entry->filename));
 		return FAILURE;
 	}
 }
@@ -2527,7 +2492,7 @@ zend_string *phar_create_default_stub(const char *index_php, const char *web_ind
 }
 /* }}} */
 
-void phar_flush(phar_archive_data *phar, char **error) {
+ZEND_ATTRIBUTE_NONNULL void phar_flush(phar_archive_data *phar, char **error) {
 	phar_flush_ex(phar, NULL, false, error);
 }
 
@@ -2536,7 +2501,7 @@ void phar_flush(phar_archive_data *phar, char **error) {
  *
  * if user_stub is NULL the default or existing stub should be used
  */
-void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_default_stub, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_default_stub, char **error) /* {{{ */
 {
 	static const char halt_stub[] = "__HALT_COMPILER();";
 
@@ -2562,15 +2527,11 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 	php_stream *shared_cfp = NULL;
 
 	if (phar->is_persistent) {
-		if (error) {
-			spprintf(error, 0, "internal error: attempt to flush cached zip-based phar \"%s\"", phar->fname);
-		}
+		spprintf(error, 0, "internal error: attempt to flush cached zip-based phar \"%s\"", phar->fname);
 		return;
 	}
 
-	if (error) {
-		*error = NULL;
-	}
+	*error = NULL;
 
 	if (!zend_hash_num_elements(&phar->manifest) && !user_stub) {
 		return;
@@ -2602,9 +2563,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 	}
 	newfile = php_stream_fopen_tmpfile();
 	if (!newfile) {
-		if (error) {
-			spprintf(error, 0, "unable to create temporary file");
-		}
+		*error = estrdup("unable to create temporary file");
 		if (must_close_old_file) {
 			php_stream_close(oldfile);
 		}
@@ -2619,9 +2578,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 				php_stream_close(oldfile);
 			}
 			php_stream_close(newfile);
-			if (error) {
-				spprintf(error, 0, "illegal stub for phar \"%s\" (__HALT_COMPILER(); is missing)", phar->fname);
-			}
+			spprintf(error, 0, "illegal stub for phar \"%s\" (__HALT_COMPILER(); is missing)", phar->fname);
 			return;
 		}
 
@@ -2637,9 +2594,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 				php_stream_close(oldfile);
 			}
 			php_stream_close(newfile);
-			if (error) {
-				spprintf(error, 0, "unable to create stub from string in new phar \"%s\"", phar->fname);
-			}
+			spprintf(error, 0, "unable to create stub from string in new phar \"%s\"", phar->fname);
 			return;
 		}
 		phar->halt_offset = len + end_sequence_len;
@@ -2660,12 +2615,10 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 				php_stream_close(oldfile);
 			}
 			php_stream_close(newfile);
-			if (error) {
-				if (new_stub) {
-					spprintf(error, 0, "unable to create stub in new phar \"%s\"", phar->fname);
-				} else {
-					spprintf(error, 0, "unable to copy stub of old phar to new phar \"%s\"", phar->fname);
-				}
+			if (new_stub) {
+				spprintf(error, 0, "unable to create stub in new phar \"%s\"", phar->fname);
+			} else {
+				spprintf(error, 0, "unable to copy stub of old phar to new phar \"%s\"", phar->fname);
 			}
 			if (new_stub) {
 				zend_string_free(new_stub);
@@ -2763,9 +2716,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 				php_stream_close(oldfile);
 			}
 			php_stream_close(newfile);
-			if (error) {
-				spprintf(error, 0, "unable to seek to start of file \"%s\" while creating new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-			}
+			spprintf(error, 0, "unable to seek to start of file \"%s\" while creating new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
 			return;
 		}
 		newcrc32 = php_crc32_bulk_init();
@@ -2783,15 +2734,10 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 				php_stream_close(oldfile);
 			}
 			php_stream_close(newfile);
-			if (entry->flags & PHAR_ENT_COMPRESSED_GZ) {
-				if (error) {
-					spprintf(error, 0, "unable to gzip compress file \"%s\" to new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-				}
-			} else {
-				if (error) {
-					spprintf(error, 0, "unable to bzip2 compress file \"%s\" to new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-				}
-			}
+			spprintf(error, 0, "unable to %s compress file \"%s\" to new phar \"%s\"",
+				entry->flags & PHAR_ENT_COMPRESSED_GZ ? "gzip" : "bzip2",
+				ZSTR_VAL(entry->filename),
+				phar->fname);
 			return;
 		}
 
@@ -2804,9 +2750,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 		entry->cfp = shared_cfp;
 		if (!entry->cfp) {
 			php_stream_filter_free(filter);
-			if (error) {
-				spprintf(error, 0, "unable to create temporary file");
-			}
+			*error = estrdup("unable to create temporary file");
 			if (must_close_old_file) {
 				php_stream_close(oldfile);
 			}
@@ -2823,9 +2767,8 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 				php_stream_close(oldfile);
 			}
 			php_stream_close(newfile);
-			if (error) {
-				spprintf(error, 0, "unable to seek to start of file \"%s\" while creating new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-			}
+			spprintf(error, 0, "unable to seek to start of file \"%s\" while creating new phar \"%s\"",
+				ZSTR_VAL(entry->filename), phar->fname);
 			goto cleanup;
 		}
 		php_stream_filter_append((&entry->cfp->writefilters), filter);
@@ -2835,9 +2778,8 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 				php_stream_close(oldfile);
 			}
 			php_stream_close(newfile);
-			if (error) {
-				spprintf(error, 0, "unable to copy compressed file contents of file \"%s\" while creating new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-			}
+			spprintf(error, 0, "unable to copy compressed file contents of file \"%s\" while creating new phar \"%s\"",
+				ZSTR_VAL(entry->filename), phar->fname);
 			goto cleanup;
 		}
 		php_stream_filter_flush(filter, 1);
@@ -2897,9 +2839,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 		php_stream_close(newfile);
 		phar->alias_len = restore_alias_len;
 
-		if (error) {
-			spprintf(error, 0, "unable to write manifest header of new phar \"%s\"", phar->fname);
-		}
+		spprintf(error, 0, "unable to write manifest header of new phar \"%s\"", phar->fname);
 
 		goto cleanup;
 	}
@@ -2918,9 +2858,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 		php_stream_close(newfile);
 		phar->alias_len = restore_alias_len;
 
-		if (error) {
-			spprintf(error, 0, "unable to write manifest meta-data of new phar \"%s\"", phar->fname);
-		}
+		spprintf(error, 0, "unable to write manifest meta-data of new phar \"%s\"", phar->fname);
 
 		goto cleanup;
 	}
@@ -2951,12 +2889,10 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 				php_stream_close(oldfile);
 			}
 			php_stream_close(newfile);
-			if (error) {
-				if (entry->is_dir) {
-					spprintf(error, 0, "unable to write filename of directory \"%s\" to manifest of new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-				} else {
-					spprintf(error, 0, "unable to write filename of file \"%s\" to manifest of new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-				}
+			if (entry->is_dir) {
+				spprintf(error, 0, "unable to write filename of directory \"%s\" to manifest of new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
+			} else {
+				spprintf(error, 0, "unable to write filename of file \"%s\" to manifest of new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
 			}
 			goto cleanup;
 		}
@@ -2988,9 +2924,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 
 			php_stream_close(newfile);
 
-			if (error) {
-				spprintf(error, 0, "unable to write temporary manifest of file \"%s\" to manifest of new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-			}
+			spprintf(error, 0, "unable to write temporary manifest of file \"%s\" to manifest of new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
 
 			goto cleanup;
 		}
@@ -3004,9 +2938,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 
 			php_stream_close(newfile);
 
-			if (error) {
-				spprintf(error, 0, "unable to write manifest padding byte");
-			}
+			*error = estrdup("unable to write manifest padding byte");
 
 			goto cleanup;
 		}
@@ -3029,9 +2961,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 					php_stream_close(oldfile);
 				}
 				php_stream_close(newfile);
-				if (error) {
-					spprintf(error, 0, "unable to seek to start of file \"%s\" while creating new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-				}
+				spprintf(error, 0, "unable to seek to start of file \"%s\" while creating new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
 				goto cleanup;
 			}
 		}
@@ -3041,9 +2971,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 				php_stream_close(oldfile);
 			}
 			php_stream_close(newfile);
-			if (error) {
-				spprintf(error, 0, "unable to seek to start of file \"%s\" while creating new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-			}
+			spprintf(error, 0, "unable to seek to start of file \"%s\" while creating new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
 			goto cleanup;
 		}
 
@@ -3057,9 +2985,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 
 			php_stream_close(newfile);
 
-			if (error) {
-				spprintf(error, 0, "unable to write contents of file \"%s\" to new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
-			}
+			spprintf(error, 0, "unable to write contents of file \"%s\" to new phar \"%s\"", ZSTR_VAL(entry->filename), phar->fname);
 
 			goto cleanup;
 		}
@@ -3105,12 +3031,11 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 				char *digest = NULL;
 				size_t digest_len;
 
-				if (FAILURE == phar_create_signature(phar, newfile, &digest, &digest_len, error)) {
-					if (error) {
-						char *save = *error;
-						spprintf(error, 0, "phar error: unable to write signature: %s", save);
-						efree(save);
-					}
+				char *signature_error = NULL;
+				if (FAILURE == phar_create_signature(phar, newfile, &digest, &digest_len, &signature_error)) {
+					spprintf(error, 0, "phar error: unable to write signature: %s", signature_error);
+					efree(signature_error);
+
 					if (digest) {
 						efree(digest);
 					}
@@ -3167,9 +3092,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 		phar->fp = php_stream_open_wrapper(phar->fname, "w+b", IGNORE_URL|STREAM_MUST_SEEK|REPORT_ERRORS, NULL);
 		if (!phar->fp) {
 			phar->fp = newfile;
-			if (error) {
-				spprintf(error, 4096, "unable to open new phar \"%s\" for writing", phar->fname);
-			}
+			spprintf(error, 4096, "unable to open new phar \"%s\" for writing", phar->fname);
 			return;
 		}
 
@@ -3183,9 +3106,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 			zend_array_destroy(Z_ARR(filterparams));
 
 			if (!filter) {
-				if (error) {
-					spprintf(error, 4096, "unable to compress all contents of phar \"%s\" using zlib, PHP versions older than 5.2.6 have a buggy zlib", phar->fname);
-				}
+				spprintf(error, 4096, "unable to compress all contents of phar \"%s\" using zlib, PHP versions older than 5.2.6 have a buggy zlib", phar->fname);
 				return;
 			}
 
@@ -3213,9 +3134,7 @@ void phar_flush_ex(phar_archive_data *phar, zend_string *user_stub, bool is_defa
 	}
 
 	if (-1 == php_stream_seek(phar->fp, phar->halt_offset, SEEK_SET)) {
-		if (error) {
-			spprintf(error, 0, "unable to seek to __HALT_COMPILER(); in new phar \"%s\"", phar->fname);
-		}
+		spprintf(error, 0, "unable to seek to __HALT_COMPILER(); in new phar \"%s\"", phar->fname);
 	}
 
 	return;
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index fe63e075c1b..232ba579d7f 100644
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -404,15 +404,15 @@ void phar_request_initialize(void);
 void phar_object_init(void);
 void phar_destroy_phar_data(phar_archive_data *phar);
 
-zend_result phar_postprocess_file(phar_entry_data *idata, uint32_t crc32, char **error, int process_zip);
+ZEND_ATTRIBUTE_NONNULL zend_result phar_postprocess_file(phar_entry_data *idata, uint32_t crc32, char **error, int process_zip);
 zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, uint32_t options, phar_archive_data** pphar, char **error);
-zend_result phar_open_or_create_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
-zend_result phar_create_or_parse_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
-zend_result phar_open_executed_filename(char *alias, size_t alias_len, char **error);
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_open_or_create_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_create_or_parse_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
+ZEND_ATTRIBUTE_NONNULL_ARGS(3) zend_result phar_open_executed_filename(char *alias, size_t alias_len, char **error);
 zend_result phar_free_alias(phar_archive_data *phar, char *alias, size_t alias_len);
 zend_result phar_get_archive(phar_archive_data **archive, char *fname, size_t fname_len, char *alias, size_t alias_len, char **error);
 zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t sig_type, char *sig, size_t sig_len, char *fname, char **signature, size_t *signature_len, char **error);
-zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signature, size_t *signature_length, char **error);
+ZEND_ATTRIBUTE_NONNULL zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signature, size_t *signature_length, char **error);
 
 /* utility functions */
 zend_string *phar_create_default_stub(const char *index_php, const char *web_index, char **error);
@@ -424,7 +424,7 @@ void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, size_t filen
 zend_result phar_mount_entry(phar_archive_data *phar, char *filename, size_t filename_len, char *path, size_t path_len);
 zend_string *phar_find_in_include_path(zend_string *file, phar_archive_data **pphar);
 char *phar_fix_filepath(char *path, size_t *new_len, bool use_cwd);
-phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, char **error);
+ZEND_ATTRIBUTE_NONNULL phar_entry_info * phar_open_jit(const phar_archive_data *phar, phar_entry_info *entry, char **error);
 void phar_parse_metadata_lazy(const char *buffer, phar_metadata_tracker *tracker, uint32_t zip_metadata_len, bool persistent);
 bool phar_metadata_tracker_has_data(const phar_metadata_tracker* tracker, bool persistent);
 /* If this has data, free it and set all values to undefined. */
@@ -436,8 +436,8 @@ zend_result phar_metadata_tracker_unserialize_or_copy(phar_metadata_tracker* tra
 void destroy_phar_manifest_entry(zval *zv);
 int phar_seek_efp(phar_entry_info *entry, zend_off_t offset, int whence, zend_off_t position, bool follow_links);
 php_stream *phar_get_efp(phar_entry_info *entry, bool follow_links);
-zend_result phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **error);
-zend_result phar_open_entry_fp(phar_entry_info *entry, char **error, bool follow_links);
+ZEND_ATTRIBUTE_NONNULL zend_result phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **error);
+ZEND_ATTRIBUTE_NONNULL zend_result phar_open_entry_fp(phar_entry_info *entry, char **error, bool follow_links);
 phar_entry_info *phar_get_link_source(phar_entry_info *entry);
 zend_result phar_open_archive_fp(phar_archive_data *phar);
 zend_result phar_copy_on_write(phar_archive_data **pphar);
@@ -445,13 +445,13 @@ zend_result phar_copy_on_write(phar_archive_data **pphar);
 /* tar functions in tar.c */
 bool phar_is_tar(char *buf, char *fname);
 zend_result phar_parse_tarfile(php_stream* fp, char *fname, size_t fname_len, char *alias, size_t alias_len, phar_archive_data** pphar, uint32_t compression, char **error);
-zend_result phar_open_or_create_tar(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
-void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_default_stub, char **error);
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_open_or_create_tar(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_default_stub, char **error);
 
 /* zip functions in zip.c */
 zend_result phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alias, size_t alias_len, phar_archive_data** pphar, char **error);
-zend_result phar_open_or_create_zip(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
-void phar_zip_flush(phar_archive_data *archive, zend_string *user_stub, bool is_default_stub, char **error);
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_open_or_create_zip(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_zip_flush(phar_archive_data *archive, zend_string *user_stub, bool is_default_stub, char **error);
 
 #ifdef PHAR_MAIN
 extern const php_stream_wrapper php_stream_phar_wrapper;
@@ -465,10 +465,10 @@ void phar_entry_delref(phar_entry_data *idata);
 
 phar_entry_info *phar_get_entry_info(phar_archive_data *phar, char *path, size_t path_len, char **error, bool security);
 phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, size_t path_len, char dir, char **error, bool security);
-phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security);
-zend_result phar_get_entry_data(phar_entry_data **ret, char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security);
-void phar_flush_ex(phar_archive_data *archive, zend_string *user_stub, bool is_default_stub, char **error);
-void phar_flush(phar_archive_data *archive, char **error);
+ZEND_ATTRIBUTE_NONNULL phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security);
+ZEND_ATTRIBUTE_NONNULL zend_result phar_get_entry_data(phar_entry_data **ret, char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security);
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_flush_ex(phar_archive_data *archive, zend_string *user_stub, bool is_default_stub, char **error);
+ZEND_ATTRIBUTE_NONNULL void phar_flush(phar_archive_data *archive, char **error);
 zend_result phar_detect_phar_fname_ext(const char *filename, size_t filename_len, const char **ext_str, size_t *ext_len, int executable, int for_create, bool is_complete);
 zend_result phar_split_fname(const char *filename, size_t filename_len, char **arch, size_t *arch_len, char **entry, size_t *entry_len, int executable, int for_create);
 
@@ -484,6 +484,6 @@ typedef enum {
 	pcr_err_empty_entry
 } phar_path_check_result;
 
-phar_path_check_result phar_path_check(char **p, size_t *len, const char **error);
+ZEND_ATTRIBUTE_NONNULL phar_path_check_result phar_path_check(char **p, size_t *len, const char **error);
 
 END_EXTERN_C()
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 0b7e55c5e9a..8a7cf236b09 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -4108,7 +4108,7 @@ PHP_METHOD(Phar, delMetadata)
 }
 /* }}} */
 
-static zend_result phar_extract_file(bool overwrite, phar_entry_info *entry, const zend_string *path, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL static zend_result phar_extract_file(bool overwrite, phar_entry_info *entry, const zend_string *path, char **error) /* {{{ */
 {
 	php_stream_statbuf ssb;
 	size_t len;
@@ -4245,9 +4245,10 @@ static zend_result phar_extract_file(bool overwrite, phar_entry_info *entry, con
 	}
 
 	if ((phar_get_fp_type(entry) == PHAR_FP && (entry->flags & PHAR_ENT_COMPRESSION_MASK)) || !phar_get_efp(entry, false)) {
-		if (FAILURE == phar_open_entry_fp(entry, error, true)) {
-			if (error) {
-				spprintf(error, 4096, "Cannot extract \"%s\" to \"%s\", unable to open internal file pointer: %s", ZSTR_VAL(entry->filename), fullpath, *error);
+		char *open_entry_error = NULL;
+		if (FAILURE == phar_open_entry_fp(entry, &open_entry_error, true)) {
+			if (open_entry_error) {
+				spprintf(error, 4096, "Cannot extract \"%s\" to \"%s\", unable to open internal file pointer: %s", ZSTR_VAL(entry->filename), fullpath, open_entry_error);
 			} else {
 				spprintf(error, 4096, "Cannot extract \"%s\" to \"%s\", unable to open internal file pointer", ZSTR_VAL(entry->filename), fullpath);
 			}
@@ -4285,7 +4286,7 @@ static zend_result phar_extract_file(bool overwrite, phar_entry_info *entry, con
 }
 /* }}} */
 
-static int extract_helper(const phar_archive_data *archive, zend_string *search, const zend_string *path_to, bool overwrite, char **error) { /* {{{ */
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 3, 5) static int extract_helper(const phar_archive_data *archive, zend_string *search, const zend_string *path_to, bool overwrite, char **error) { /* {{{ */
 	int extracted = 0;
 	phar_entry_info *entry;
 
diff --git a/ext/phar/phar_path_check.re b/ext/phar/phar_path_check.re
index 77aa0b1953d..689ffaa5124 100644
--- a/ext/phar/phar_path_check.re
+++ b/ext/phar/phar_path_check.re
@@ -18,7 +18,7 @@
 
 #include "phar_internal.h"
 
-phar_path_check_result phar_path_check(char **s, size_t *len, const char **error)
+ZEND_ATTRIBUTE_NONNULL phar_path_check_result phar_path_check(char **s, size_t *len, const char **error)
 {
 	const unsigned char *p = (const unsigned char*)*s;
 	const unsigned char *m;
diff --git a/ext/phar/stream.h b/ext/phar/stream.h
index ce75b70dcba..83b395b4cfc 100644
--- a/ext/phar/stream.h
+++ b/ext/phar/stream.h
@@ -21,7 +21,7 @@ BEGIN_EXTERN_C()
 #include "ext/standard/url.h"
 
 php_url* phar_parse_url(php_stream_wrapper *wrapper, const char *filename, const char *mode, int options);
-void phar_entry_remove(phar_entry_data *idata, char **error);
+ZEND_ATTRIBUTE_NONNULL void phar_entry_remove(phar_entry_data *idata, char **error);
 
 static php_stream* phar_wrapper_open_url(php_stream_wrapper *wrapper, const char *path, const char *mode, int options, zend_string **opened_path, php_stream_context *context STREAMS_DC);
 static int phar_wrapper_rename(php_stream_wrapper *wrapper, const char *url_from, const char *url_to, int options, php_stream_context *context);
diff --git a/ext/phar/tar.c b/ext/phar/tar.c
index 540f2658922..550183746a2 100644
--- a/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@ -127,7 +127,7 @@ bool phar_is_tar(char *buf, char *fname) /* {{{ */
 }
 /* }}} */
 
-zend_result phar_open_or_create_tar(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_open_or_create_tar(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
 {
 	phar_archive_data *phar;
 	zend_result ret = phar_create_or_parse_filename(fname, fname_len, alias, alias_len, is_data, options, &phar, error);
@@ -136,9 +136,7 @@ zend_result phar_open_or_create_tar(char *fname, size_t fname_len, char *alias,
 		return FAILURE;
 	}
 
-	if (pphar) {
-		*pphar = phar;
-	}
+	*pphar = phar;
 
 	phar->is_data = is_data;
 
@@ -153,9 +151,7 @@ zend_result phar_open_or_create_tar(char *fname, size_t fname_len, char *alias,
 	}
 
 	/* we've reached here - the phar exists and is a regular phar */
-	if (error) {
-		spprintf(error, 4096, "phar tar error: \"%s\" already exists as a regular phar and must be deleted from disk prior to creating as a tar-based phar", fname);
-	}
+	spprintf(error, 4096, "phar tar error: \"%s\" already exists as a regular phar and must be deleted from disk prior to creating as a tar-based phar", fname);
 	return FAILURE;
 }
 /* }}} */
@@ -877,7 +873,7 @@ static int phar_tar_writeheaders(zval *zv, void *argument) /* {{{ */
 }
 /* }}} */
 
-static int phar_tar_setmetadata(const phar_metadata_tracker *tracker, phar_entry_info *entry, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL static int phar_tar_setmetadata(const phar_metadata_tracker *tracker, phar_entry_info *entry, char **error) /* {{{ */
 {
 	/* Copy the metadata from tracker to the new entry being written out to temporary files */
 	const zend_string *serialized_str;
@@ -897,7 +893,7 @@ static int phar_tar_setmetadata(const phar_metadata_tracker *tracker, phar_entry
 	entry->fp = php_stream_fopen_tmpfile();
 	entry->offset = entry->offset_abs = 0;
 	if (entry->fp == NULL) {
-		spprintf(error, 0, "phar error: unable to create temporary file");
+		*error = estrdup("phar error: unable to create temporary file");
 		return -1;
 	}
 	if (serialized_str && ZSTR_LEN(serialized_str) != php_stream_write(entry->fp, ZSTR_VAL(serialized_str), ZSTR_LEN(serialized_str))) {
@@ -910,7 +906,7 @@ static int phar_tar_setmetadata(const phar_metadata_tracker *tracker, phar_entry
 }
 /* }}} */
 
-static int phar_tar_setupmetadata(zval *zv, void *argument) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL static int phar_tar_setupmetadata(zval *zv, void *argument) /* {{{ */
 {
 	struct _phar_pass_tar_info *i = (struct _phar_pass_tar_info *)argument;
 	char **error = i->error;
@@ -964,7 +960,7 @@ static int phar_tar_setupmetadata(zval *zv, void *argument) /* {{{ */
 }
 /* }}} */
 
-void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_default_stub, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_default_stub, char **error) /* {{{ */
 {
 	static const char newstub[] = "<?php // tar-based phar archive stub file\n__HALT_COMPILER();";
 	static const char halt_stub[] = "__HALT_COMPILER();";
@@ -988,9 +984,7 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 	entry.filename = NULL;
 
 	if (phar->is_persistent) {
-		if (error) {
-			spprintf(error, 0, "internal error: attempt to flush cached tar-based phar \"%s\"", phar->fname);
-		}
+		spprintf(error, 0, "internal error: attempt to flush cached tar-based phar \"%s\"", phar->fname);
 		return;
 	}
 
@@ -1002,13 +996,11 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 	if (!phar->is_temporary_alias && phar->alias_len) {
 		entry.fp = php_stream_fopen_tmpfile();
 		if (entry.fp == NULL) {
-			spprintf(error, 0, "phar error: unable to create temporary file");
+			*error = estrdup("phar error: unable to create temporary file");
 			return;
 		}
 		if (phar->alias_len != php_stream_write(entry.fp, phar->alias, phar->alias_len)) {
-			if (error) {
-				spprintf(error, 0, "unable to set alias in tar-based phar \"%s\"", phar->fname);
-			}
+			spprintf(error, 0, "unable to set alias in tar-based phar \"%s\"", phar->fname);
 			php_stream_close(entry.fp);
 			return;
 		}
@@ -1028,9 +1020,7 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 		char *pos = php_stristr(ZSTR_VAL(user_stub), halt_stub, ZSTR_LEN(user_stub), sizeof(halt_stub) - 1);
 
 		if (pos == NULL) {
-			if (error) {
-				spprintf(error, 0, "illegal stub for tar-based phar \"%s\"", phar->fname);
-			}
+			spprintf(error, 0, "illegal stub for tar-based phar \"%s\"", phar->fname);
 			return;
 		}
 
@@ -1040,7 +1030,7 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 
 		entry.fp = php_stream_fopen_tmpfile();
 		if (entry.fp == NULL) {
-			spprintf(error, 0, "phar error: unable to create temporary file");
+			*error = estrdup("phar error: unable to create temporary file");
 			return;
 		}
 		entry.uncompressed_filesize = len + end_sequence_len;
@@ -1049,9 +1039,7 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 			len != php_stream_write(entry.fp, ZSTR_VAL(user_stub), len)
 			|| end_sequence_len != php_stream_write(entry.fp, end_sequence, end_sequence_len)
 		) {
-			if (error) {
-				spprintf(error, 0, "unable to create stub from string in new tar-based phar \"%s\"", phar->fname);
-			}
+			spprintf(error, 0, "unable to create stub from string in new tar-based phar \"%s\"", phar->fname);
 			php_stream_close(entry.fp);
 			return;
 		}
@@ -1062,14 +1050,13 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 		/* Either this is a brand new phar (add the stub), or the default stub is required (overwrite the stub) */
 		entry.fp = php_stream_fopen_tmpfile();
 		if (entry.fp == NULL) {
-			spprintf(error, 0, "phar error: unable to create temporary file");
+			*error = estrdup("phar error: unable to create temporary file");
 			return;
 		}
 		if (sizeof(newstub)-1 != php_stream_write(entry.fp, newstub, sizeof(newstub)-1)) {
 			php_stream_close(entry.fp);
-			if (error) {
-				spprintf(error, 0, "unable to %s stub in%star-based phar \"%s\", failed", user_stub ? "overwrite" : "create", user_stub ? " " : " new ", phar->fname);
-			}
+			spprintf(error, 0, "unable to %s stub in%star-based phar \"%s\", failed",
+				user_stub ? "overwrite" : "create", user_stub ? " " : " new ", phar->fname);
 			return;
 		}
 
@@ -1081,9 +1068,7 @@ void phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 				if (NULL == zend_hash_add_mem(&phar->manifest, entry.filename, &entry, sizeof(phar_entry_info))) {
 					php_stream_close(entry.fp);
 					zend_string_efree(entry.filename);
-					if (error) {
-						spprintf(error, 0, "unable to create stub in tar-based phar \"%s\"", phar->fname);
-					}
+					spprintf(error, 0, "unable to create stub in tar-based phar \"%s\"", phar->fname);
 					return;
 				}
 			} else {
@@ -1106,9 +1091,7 @@ nostub:
 
 	newfile = php_stream_fopen_tmpfile();
 	if (!newfile) {
-		if (error) {
-			spprintf(error, 0, "unable to create temporary file");
-		}
+		*error = estrdup("unable to create temporary file");
 		if (must_close_old_file) {
 			php_stream_close(oldfile);
 		}
@@ -1159,7 +1142,7 @@ nostub:
 
 	zend_hash_apply_with_argument(&phar->manifest, phar_tar_setupmetadata, (void *) &pass);
 
-	if (error && *error) {
+	if (*error) {
 		if (must_close_old_file) {
 			php_stream_close(oldfile);
 		}
@@ -1171,7 +1154,7 @@ nostub:
 
 	zend_hash_apply_with_argument(&phar->manifest, phar_tar_writeheaders, (void *) &pass);
 
-	if (error && *error) {
+	if (*error) {
 		if (must_close_old_file) {
 			php_stream_close(oldfile);
 		}
@@ -1183,12 +1166,10 @@ nostub:
 
 	/* add signature for executable tars or tars explicitly set with setSignatureAlgorithm */
 	if (!phar->is_data || phar->sig_flags) {
-		if (FAILURE == phar_create_signature(phar, newfile, &signature, &signature_length, error)) {
-			if (error) {
-				char *save = *error;
-				spprintf(error, 0, "phar error: unable to write signature to tar-based phar: %s", save);
-				efree(save);
-			}
+		char *signature_error = NULL;
+		if (FAILURE == phar_create_signature(phar, newfile, &signature, &signature_length, &signature_error)) {
+			spprintf(error, 0, "phar error: unable to write signature to tar-based phar: %s", signature_error);
+			efree(signature_error);
 
 			if (must_close_old_file) {
 				php_stream_close(oldfile);
@@ -1200,7 +1181,7 @@ nostub:
 
 		entry.fp = php_stream_fopen_tmpfile();
 		if (entry.fp == NULL) {
-			spprintf(error, 0, "phar error: unable to create temporary file");
+			*error = estrdup("phar error: unable to create temporary file");
 
 			efree(signature);
 			if (must_close_old_file) {
@@ -1225,9 +1206,7 @@ nostub:
 
 		if (8 != php_stream_write(entry.fp, sigbuf, 8) || signature_length != php_stream_write(entry.fp, signature, signature_length)) {
 			efree(signature);
-			if (error) {
-				spprintf(error, 0, "phar error: unable to write signature to tar-based phar %s", phar->fname);
-			}
+			spprintf(error, 0, "phar error: unable to write signature to tar-based phar %s", phar->fname);
 
 			if (must_close_old_file) {
 				php_stream_close(oldfile);
@@ -1244,7 +1223,7 @@ nostub:
 		phar_tar_writeheaders_int(&entry, &pass);
 		ZSTR_ALLOCA_FREE(entry.filename, use_heap);
 
-		if (error && *error) {
+		if (*error) {
 			if (must_close_old_file) {
 				php_stream_close(oldfile);
 			}
@@ -1264,7 +1243,7 @@ nostub:
 	}
 
 	/* on error in the hash iterator above, error is set */
-	if (error && *error) {
+	if (*error) {
 		php_stream_close(newfile);
 		return;
 	}
@@ -1290,9 +1269,7 @@ nostub:
 		phar->fp = php_stream_open_wrapper(phar->fname, "w+b", IGNORE_URL|STREAM_MUST_SEEK|REPORT_ERRORS, NULL);
 		if (!phar->fp) {
 			phar->fp = newfile;
-			if (error) {
-				spprintf(error, 0, "unable to open new phar \"%s\" for writing", phar->fname);
-			}
+			spprintf(error, 0, "unable to open new phar \"%s\" for writing", phar->fname);
 			return;
 		}
 
@@ -1314,9 +1291,7 @@ nostub:
 				/* copy contents uncompressed rather than lose them */
 				php_stream_copy_to_stream_ex(newfile, phar->fp, PHP_STREAM_COPY_ALL, NULL);
 				php_stream_close(newfile);
-				if (error) {
-					spprintf(error, 4096, "unable to compress all contents of phar \"%s\" using zlib, PHP versions older than 5.2.6 have a buggy zlib", phar->fname);
-				}
+				spprintf(error, 4096, "unable to compress all contents of phar \"%s\" using zlib, PHP versions older than 5.2.6 have a buggy zlib", phar->fname);
 				return;
 			}
 
diff --git a/ext/phar/util.c b/ext/phar/util.c
index 51ebfb36275..884e96fb979 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -362,8 +362,10 @@ splitted:
 }
 /* }}} */
 
-static zend_result phar_create_writeable_entry(phar_archive_data *phar, phar_entry_info *entry, char **error) /* {{{ */
+static ZEND_ATTRIBUTE_NONNULL zend_result phar_create_writeable_entry(phar_archive_data *phar, phar_entry_info *entry, char **error) /* {{{ */
 {
+	*error = NULL;
+
 	if (entry->fp_type == PHAR_MOD) {
 		/* already newly created, truncate */
 		php_stream_truncate_set_size(entry->fp, 0);
@@ -381,10 +383,6 @@ static zend_result phar_create_writeable_entry(phar_archive_data *phar, phar_ent
 		return SUCCESS;
 	}
 
-	if (error) {
-		*error = NULL;
-	}
-
 	/* open a new temp file for writing */
 	if (entry->link) {
 		efree(entry->link);
@@ -395,9 +393,7 @@ static zend_result phar_create_writeable_entry(phar_archive_data *phar, phar_ent
 	entry->fp = php_stream_fopen_tmpfile();
 
 	if (!entry->fp) {
-		if (error) {
-			spprintf(error, 0, "phar error: unable to create temporary file");
-		}
+		*error = estrdup("phar error: unable to create temporary file");
 		return FAILURE;
 	}
 
@@ -415,7 +411,7 @@ static zend_result phar_create_writeable_entry(phar_archive_data *phar, phar_ent
 }
 /* }}} */
 
-static zend_result phar_separate_entry_fp(phar_entry_info *entry, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL static zend_result phar_separate_entry_fp(phar_entry_info *entry, char **error) /* {{{ */
 {
 	php_stream *fp;
 	phar_entry_info *link;
@@ -430,7 +426,7 @@ static zend_result phar_separate_entry_fp(phar_entry_info *entry, char **error)
 
 	fp = php_stream_fopen_tmpfile();
 	if (fp == NULL) {
-		spprintf(error, 0, "phar error: unable to create temporary file");
+		*error = estrdup("phar error: unable to create temporary file");
 		return FAILURE;
 	}
 	phar_seek_efp(entry, 0, SEEK_SET, 0, true);
@@ -441,9 +437,7 @@ static zend_result phar_separate_entry_fp(phar_entry_info *entry, char **error)
 	}
 
 	if (SUCCESS != php_stream_copy_to_stream_ex(phar_get_efp(link, false), fp, link->uncompressed_filesize, NULL)) {
-		if (error) {
-			spprintf(error, 4096, "phar error: cannot separate entry file \"%s\" contents in phar archive \"%s\" for write access", ZSTR_VAL(entry->filename), entry->phar->fname);
-		}
+		spprintf(error, 4096, "phar error: cannot separate entry file \"%s\" contents in phar archive \"%s\" for write access", ZSTR_VAL(entry->filename), entry->phar->fname);
 		return FAILURE;
 	}
 
@@ -469,7 +463,7 @@ static zend_result phar_separate_entry_fp(phar_entry_info *entry, char **error)
  * appended, truncated, or read.  For read, if the entry is marked unmodified, it is
  * assumed that the file pointer, if present, is opened for reading
  */
-zend_result phar_get_entry_data(phar_entry_data **ret, char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL zend_result phar_get_entry_data(phar_entry_data **ret, char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security) /* {{{ */
 {
 	phar_archive_data *phar;
 	phar_entry_info *entry;
@@ -478,31 +472,20 @@ zend_result phar_get_entry_data(phar_entry_data **ret, char *fname, size_t fname
 	bool for_create = mode[0] != 'r';
 	bool for_trunc  = mode[0] == 'w';
 
-	if (!ret) {
-		return FAILURE;
-	}
-
 	*ret = NULL;
-
-	if (error) {
-		*error = NULL;
-	}
+	*error = NULL;
 
 	if (FAILURE == phar_get_archive(&phar, fname, fname_len, NULL, 0, error)) {
 		return FAILURE;
 	}
 
 	if (for_write && PHAR_G(readonly) && !phar->is_data) {
-		if (error) {
-			spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be opened for writing, disabled by ini setting", path, fname);
-		}
+		spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be opened for writing, disabled by ini setting", path, fname);
 		return FAILURE;
 	}
 
 	if (!path_len) {
-		if (error) {
-			spprintf(error, 4096, "phar error: file \"\" in phar \"%s\" must not be empty", fname);
-		}
+		spprintf(error, 4096, "phar error: file \"\" in phar \"%s\" must not be empty", fname);
 		return FAILURE;
 	}
 really_get_entry:
@@ -524,9 +507,7 @@ really_get_entry:
 
 	if (for_write && phar->is_persistent) {
 		if (FAILURE == phar_copy_on_write(&phar)) {
-			if (error) {
-				spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be opened for writing, could not make cached phar writeable", path, fname);
-			}
+			spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be opened for writing, could not make cached phar writeable", path, fname);
 			return FAILURE;
 		} else {
 			goto really_get_entry;
@@ -534,16 +515,12 @@ really_get_entry:
 	}
 
 	if (entry->is_modified && !for_write) {
-		if (error) {
-			spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be opened for reading, writable file pointers are open", path, fname);
-		}
+		spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be opened for reading, writable file pointers are open", path, fname);
 		return FAILURE;
 	}
 
 	if (entry->fp_refcount && for_write) {
-		if (error) {
-			spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be opened for writing, readable file pointers are open", path, fname);
-		}
+		spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be opened for writing, readable file pointers are open", path, fname);
 		return FAILURE;
 	}
 
@@ -629,7 +606,7 @@ really_get_entry:
 /**
  * Create a new dummy file slot within a writeable phar for a newly created file
  */
-phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security) /* {{{ */
 {
 	phar_archive_data *phar;
 	phar_entry_info *entry, etemp;
@@ -654,16 +631,12 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, ch
 	}
 
 	if (phar_path_check(&path, &path_len, &pcr_error) > pcr_is_ok) {
-		if (error) {
-			spprintf(error, 0, "phar error: invalid path \"%s\" contains %s", path, pcr_error);
-		}
+		spprintf(error, 0, "phar error: invalid path \"%s\" contains %s", path, pcr_error);
 		return NULL;
 	}
 
 	if (phar->is_persistent && FAILURE == phar_copy_on_write(&phar)) {
-		if (error) {
-			spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be created, could not make cached phar writeable", path, fname);
-		}
+		spprintf(error, 4096, "phar error: file \"%s\" in phar \"%s\" cannot be created, could not make cached phar writeable", path, fname);
 		return NULL;
 	}
 
@@ -676,9 +649,7 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, ch
 	etemp.fp = php_stream_fopen_tmpfile();
 
 	if (!etemp.fp) {
-		if (error) {
-			spprintf(error, 0, "phar error: unable to create temporary file");
-		}
+		*error = estrdup("phar error: unable to create temporary file");
 		efree(ret);
 		return NULL;
 	}
@@ -710,9 +681,8 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, ch
 
 	if (NULL == (entry = zend_hash_add_mem(&phar->manifest, etemp.filename, &etemp, sizeof(phar_entry_info)))) {
 		php_stream_close(etemp.fp);
-		if (error) {
-			spprintf(error, 0, "phar error: unable to add new entry \"%s\" to phar \"%s\"", ZSTR_VAL(etemp.filename), phar->fname);
-		}
+		spprintf(error, 0, "phar error: unable to add new entry \"%s\" to phar \"%s\"",
+			ZSTR_VAL(etemp.filename), phar->fname);
 		efree(ret);
 		zend_string_efree(etemp.filename);
 		return NULL;
@@ -760,7 +730,7 @@ zend_result phar_open_archive_fp(phar_archive_data *phar) /* {{{ */
 /* }}} */
 
 /* copy file data from an existing to a new phar_entry_info that is not in the manifest */
-zend_result phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL zend_result phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **error) /* {{{ */
 {
 	phar_entry_info *link;
 
@@ -779,7 +749,7 @@ zend_result phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, c
 	dest->is_modified = 1;
 	dest->fp = php_stream_fopen_tmpfile();
 	if (dest->fp == NULL) {
-		spprintf(error, 0, "phar error: unable to create temporary file");
+		*error = estrdup("phar error: unable to create temporary file");
 		return EOF;
 	}
 	phar_seek_efp(source, 0, SEEK_SET, 0, true);
@@ -792,9 +762,8 @@ zend_result phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, c
 	if (SUCCESS != php_stream_copy_to_stream_ex(phar_get_efp(link, false), dest->fp, link->uncompressed_filesize, NULL)) {
 		php_stream_close(dest->fp);
 		dest->fp_type = PHAR_FP;
-		if (error) {
-			spprintf(error, 4096, "phar error: unable to copy contents of file \"%s\" to \"%s\" in phar archive \"%s\"", ZSTR_VAL(source->filename), ZSTR_VAL(dest->filename), source->phar->fname);
-		}
+		spprintf(error, 4096, "phar error: unable to copy contents of file \"%s\" to \"%s\" in phar archive \"%s\"",
+			ZSTR_VAL(source->filename), ZSTR_VAL(dest->filename), source->phar->fname);
 		return FAILURE;
 	}
 
@@ -828,7 +797,7 @@ static void phar_set_fp_type(phar_entry_info *entry, enum phar_fp_type type, zen
 
 /* open and decompress a compressed phar entry
  */
-zend_result phar_open_entry_fp(phar_entry_info *entry, char **error, bool follow_links) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL zend_result phar_open_entry_fp(phar_entry_info *entry, char **error, bool follow_links) /* {{{ */
 {
 	php_stream_filter *filter;
 	phar_archive_data *phar = entry->phar;
@@ -947,11 +916,9 @@ zend_result phar_open_entry_fp(phar_entry_info *entry, char **error, bool follow
 /**
  * helper function to open an internal file's fp just-in-time
  */
-phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL phar_entry_info * phar_open_jit(const phar_archive_data *phar, phar_entry_info *entry, char **error) /* {{{ */
 {
-	if (error) {
-		*error = NULL;
-	}
+	*error = NULL;
 	/* seek to start of internal file and read it */
 	if (FAILURE == phar_open_entry_fp(entry, error, true)) {
 		return NULL;
@@ -1540,7 +1507,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 #ifndef PHAR_HAVE_OPENSSL
 			if (!zend_hash_str_exists(&module_registry, "openssl", sizeof("openssl")-1)) {
 				if (error) {
-					spprintf(error, 0, "openssl not loaded");
+					*error = estrdup("openssl not loaded");
 				}
 				return FAILURE;
 			}
@@ -1555,7 +1522,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 					php_stream_close(pfp);
 				}
 				if (error) {
-					spprintf(error, 0, "openssl public key could not be read");
+					*error = estrdup("openssl public key could not be read");
 				}
 				return FAILURE;
 			}
@@ -1568,7 +1535,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 				zend_string_release_ex(pubkey, 0);
 
 				if (error) {
-					spprintf(error, 0, "openssl signature could not be verified");
+					*error = estrdup("openssl signature could not be verified");
 				}
 
 				return FAILURE;
@@ -1583,7 +1550,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 			if (NULL == in) {
 				zend_string_release_ex(pubkey, 0);
 				if (error) {
-					spprintf(error, 0, "openssl signature could not be processed");
+					*error = estrdup("openssl signature could not be processed");
 				}
 				return FAILURE;
 			}
@@ -1594,7 +1561,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 
 			if (NULL == key) {
 				if (error) {
-					spprintf(error, 0, "openssl signature could not be processed");
+					*error = estrdup("openssl signature could not be processed");
 				}
 				return FAILURE;
 			}
@@ -1605,7 +1572,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 					EVP_MD_CTX_destroy(md_ctx);
 				}
 				if (error) {
-					spprintf(error, 0, "openssl signature could not be verified");
+					*error = estrdup("openssl signature could not be verified");
 				}
 				return FAILURE;
 			}
@@ -1637,7 +1604,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 				EVP_MD_CTX_destroy(md_ctx);
 
 				if (error) {
-					spprintf(error, 0, "broken openssl signature");
+					*error = estrdup("broken openssl signature");
 				}
 
 				return FAILURE;
@@ -1656,7 +1623,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 
 			if (sig_len < sizeof(digest)) {
 				if (error) {
-					spprintf(error, 0, "broken signature");
+					*error = estrdup("broken openssl signature");
 				}
 				return FAILURE;
 			}
@@ -1682,7 +1649,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 
 			if (memcmp(digest, sig, sizeof(digest))) {
 				if (error) {
-					spprintf(error, 0, "broken signature");
+					*error = estrdup("broken openssl signature");
 				}
 				return FAILURE;
 			}
@@ -1696,7 +1663,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 
 			if (sig_len < sizeof(digest)) {
 				if (error) {
-					spprintf(error, 0, "broken signature");
+					*error = estrdup("broken openssl signature");
 				}
 				return FAILURE;
 			}
@@ -1722,7 +1689,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 
 			if (memcmp(digest, sig, sizeof(digest))) {
 				if (error) {
-					spprintf(error, 0, "broken signature");
+					*error = estrdup("broken signature");
 				}
 				return FAILURE;
 			}
@@ -1736,7 +1703,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 
 			if (sig_len < sizeof(digest)) {
 				if (error) {
-					spprintf(error, 0, "broken signature");
+					*error = estrdup("broken signature");
 				}
 				return FAILURE;
 			}
@@ -1762,7 +1729,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 
 			if (memcmp(digest, sig, sizeof(digest))) {
 				if (error) {
-					spprintf(error, 0, "broken signature");
+					*error = estrdup("broken signature");
 				}
 				return FAILURE;
 			}
@@ -1776,7 +1743,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 
 			if (sig_len < sizeof(digest)) {
 				if (error) {
-					spprintf(error, 0, "broken signature");
+					*error = estrdup("broken signature");
 				}
 				return FAILURE;
 			}
@@ -1802,7 +1769,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 
 			if (memcmp(digest, sig, sizeof(digest))) {
 				if (error) {
-					spprintf(error, 0, "broken signature");
+					*error = estrdup("broken signature");
 				}
 				return FAILURE;
 			}
@@ -1812,7 +1779,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 		}
 		default:
 			if (error) {
-				spprintf(error, 0, "broken or unsupported signature");
+				*error = estrdup("broken or unsupported signature");
 			}
 			return FAILURE;
 	}
@@ -1820,7 +1787,7 @@ zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t s
 }
 /* }}} */
 
-zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signature, size_t *signature_length, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signature, size_t *signature_length, char **error) /* {{{ */
 {
 	unsigned char buf[1024];
 	size_t sig_len;
@@ -1888,9 +1855,7 @@ zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char
 			in = BIO_new_mem_buf(PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len));
 
 			if (in == NULL) {
-				if (error) {
-					spprintf(error, 0, "unable to write to phar \"%s\" with requested openssl signature", phar->fname);
-				}
+				spprintf(error, 0, "unable to write to phar \"%s\" with requested openssl signature", phar->fname);
 				return FAILURE;
 			}
 
@@ -1898,18 +1863,14 @@ zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char
 			BIO_free(in);
 
 			if (!key) {
-				if (error) {
-					spprintf(error, 0, "unable to process private key");
-				}
+				*error = estrdup("unable to process private key");
 				return FAILURE;
 			}
 
 			md_ctx = EVP_MD_CTX_create();
 			if (md_ctx == NULL) {
 				EVP_PKEY_free(key);
-				if (error) {
-					spprintf(error, 0, "unable to initialize openssl signature for phar \"%s\"", phar->fname);
-				}
+				spprintf(error, 0, "unable to initialize openssl signature for phar \"%s\"", phar->fname);
 				return FAILURE;
 			}
 
@@ -1920,9 +1881,7 @@ zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char
 				EVP_PKEY_free(key);
 				EVP_MD_CTX_free(md_ctx);
 				efree(sigbuf);
-				if (error) {
-					spprintf(error, 0, "unable to initialize openssl signature for phar \"%s\"", phar->fname);
-				}
+				spprintf(error, 0, "unable to initialize openssl signature for phar \"%s\"", phar->fname);
 				return FAILURE;
 			}
 
@@ -1931,9 +1890,7 @@ zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char
 					EVP_PKEY_free(key);
 					EVP_MD_CTX_free(md_ctx);
 					efree(sigbuf);
-					if (error) {
-						spprintf(error, 0, "unable to update the openssl signature for phar \"%s\"", phar->fname);
-					}
+					spprintf(error, 0, "unable to update the openssl signature for phar \"%s\"", phar->fname);
 					return FAILURE;
 				}
 			}
@@ -1942,9 +1899,7 @@ zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char
 				EVP_PKEY_free(key);
 				EVP_MD_CTX_free(md_ctx);
 				efree(sigbuf);
-				if (error) {
-					spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname);
-				}
+				spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname);
 				return FAILURE;
 			}
 
@@ -1958,9 +1913,7 @@ zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char
 			php_stream_seek(fp, 0, SEEK_END);
 
 			if (FAILURE == phar_call_openssl_signverify(true, fp, php_stream_tell(fp), PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len), (char **)&sigbuf, &siglen, phar->sig_flags)) {
-				if (error) {
-					spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname);
-				}
+				spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname);
 				return FAILURE;
 			}
 #endif
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index 4949750e287..e8ffecec571 100644
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -798,7 +798,7 @@ foundit:
 /**
  * Create or open a zip-based phar for writing
  */
-zend_result phar_open_or_create_zip(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_open_or_create_zip(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error) /* {{{ */
 {
 	phar_archive_data *phar;
 	zend_result ret = phar_create_or_parse_filename(fname, fname_len, alias, alias_len, is_data, options, &phar, error);
@@ -807,9 +807,7 @@ zend_result phar_open_or_create_zip(char *fname, size_t fname_len, char *alias,
 		return FAILURE;
 	}
 
-	if (pphar) {
-		*pphar = phar;
-	}
+	*pphar = phar;
 
 	phar->is_data = is_data;
 
@@ -824,9 +822,7 @@ zend_result phar_open_or_create_zip(char *fname, size_t fname_len, char *alias,
 	}
 
 	/* we've reached here - the phar exists and is a regular phar */
-	if (error) {
-		spprintf(error, 4096, "phar zip error: phar \"%s\" already exists as a regular phar and must be deleted from disk prior to creating as a zip-based phar", fname);
-	}
+	spprintf(error, 4096, "phar zip error: phar \"%s\" already exists as a regular phar and must be deleted from disk prior to creating as a zip-based phar", fname);
 
 	return FAILURE;
 }
@@ -1178,11 +1174,11 @@ static zend_result phar_zip_applysignature(phar_archive_data *phar, struct _phar
 			php_stream_write(newfile, ZSTR_VAL(phar->metadata_tracker.str), ZSTR_LEN(phar->metadata_tracker.str));
 		}
 
-		if (FAILURE == phar_create_signature(phar, newfile, &signature, &signature_length, pass->error)) {
-			if (pass->error) {
-				char *save = *(pass->error);
-				spprintf(pass->error, 0, "phar error: unable to write signature to zip-based phar: %s", save);
-				efree(save);
+		char *signature_error = NULL;
+		if (FAILURE == phar_create_signature(phar, newfile, &signature, &signature_length, &signature_error)) {
+			if (signature_error) {
+				spprintf(pass->error, 0, "phar error: unable to write signature to zip-based phar: %s", signature_error);
+				efree(signature_error);
 			}
 
 			php_stream_close(newfile);
@@ -1231,7 +1227,7 @@ static zend_result phar_zip_applysignature(phar_archive_data *phar, struct _phar
 }
 /* }}} */
 
-void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_default_stub, char **error) /* {{{ */
+ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_default_stub, char **error) /* {{{ */
 {
 	static const char newstub[] = "<?php // zip-based phar archive stub file\n__HALT_COMPILER();";
 	static const char halt_stub[] = "__HALT_COMPILER();";
@@ -1239,12 +1235,9 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 	php_stream *oldfile;
 	bool must_close_old_file = false;
 	phar_entry_info entry = {0};
-	char *temperr = NULL;
-	struct _phar_zip_pass pass;
 	phar_zip_dir_end eocd;
 	uint32_t cdir_size, cdir_offset;
 
-	pass.error = &temperr;
 	entry.flags = PHAR_ENT_PERM_DEF_FILE;
 	entry.timestamp = time(NULL);
 	entry.is_modified = 1;
@@ -1253,9 +1246,7 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 	entry.fp_type = PHAR_MOD;
 
 	if (phar->is_persistent) {
-		if (error) {
-			spprintf(error, 0, "internal error: attempt to flush cached zip-based phar \"%s\"", phar->fname);
-		}
+		spprintf(error, 0, "internal error: attempt to flush cached zip-based phar \"%s\"", phar->fname);
 		return;
 	}
 
@@ -1267,13 +1258,11 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 	if (!phar->is_temporary_alias && phar->alias_len) {
 		entry.fp = php_stream_fopen_tmpfile();
 		if (entry.fp == NULL) {
-			spprintf(error, 0, "phar error: unable to create temporary file");
+			*error = estrdup("phar error: unable to create temporary file");
 			return;
 		}
 		if (phar->alias_len != php_stream_write(entry.fp, phar->alias, phar->alias_len)) {
-			if (error) {
-				spprintf(error, 0, "unable to set alias in zip-based phar \"%s\"", phar->fname);
-			}
+			spprintf(error, 0, "unable to set alias in zip-based phar \"%s\"", phar->fname);
 			return;
 		}
 
@@ -1297,9 +1286,7 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 		char *pos = php_stristr(ZSTR_VAL(user_stub), halt_stub, ZSTR_LEN(user_stub), strlen(halt_stub));
 
 		if (pos == NULL) {
-			if (error) {
-				spprintf(error, 0, "illegal stub for zip-based phar \"%s\"", phar->fname);
-			}
+			spprintf(error, 0, "illegal stub for zip-based phar \"%s\"", phar->fname);
 			return;
 		}
 
@@ -1309,7 +1296,7 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 
 		entry.fp = php_stream_fopen_tmpfile();
 		if (entry.fp == NULL) {
-			spprintf(error, 0, "phar error: unable to create temporary file");
+			*error = estrdup("phar error: unable to create temporary file");
 			return;
 		}
 		entry.uncompressed_filesize = len + end_sequence_len;
@@ -1318,9 +1305,7 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 			len != php_stream_write(entry.fp, ZSTR_VAL(user_stub), len)
 			|| end_sequence_len != php_stream_write(entry.fp, end_sequence, end_sequence_len)
 		) {
-			if (error) {
-				spprintf(error, 0, "unable to create stub from string in new zip-based phar \"%s\"", phar->fname);
-			}
+			spprintf(error, 0, "unable to create stub from string in new zip-based phar \"%s\"", phar->fname);
 			php_stream_close(entry.fp);
 			return;
 		}
@@ -1332,14 +1317,12 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 		/* Either this is a brand new phar (add the stub), or the default stub is required (overwrite the stub) */
 		entry.fp = php_stream_fopen_tmpfile();
 		if (entry.fp == NULL) {
-			spprintf(error, 0, "phar error: unable to create temporary file");
+			*error = estrdup("phar error: unable to create temporary file");
 			return;
 		}
 		if (sizeof(newstub)-1 != php_stream_write(entry.fp, newstub, sizeof(newstub)-1)) {
 			php_stream_close(entry.fp);
-			if (error) {
-				spprintf(error, 0, "unable to %s stub in%szip-based phar \"%s\", failed", user_stub ? "overwrite" : "create", user_stub ? " " : " new ", phar->fname);
-			}
+			spprintf(error, 0, "unable to %s stub in%szip-based phar \"%s\", failed", user_stub ? "overwrite" : "create", user_stub ? " " : " new ", phar->fname);
 			return;
 		}
 
@@ -1351,9 +1334,7 @@ void phar_zip_flush(phar_archive_data *phar, zend_string *user_stub, bool is_def
 				if (NULL == zend_hash_add_mem(&phar->manifest, entry.filename, &entry, sizeof(phar_entry_info))) {
 					php_stream_close(entry.fp);
 					zend_string_efree(entry.filename);
-					if (error) {
-						spprintf(error, 0, "unable to create stub in zip-based phar \"%s\"", phar->fname);
-					}
+					spprintf(error, 0, "unable to create stub in zip-based phar \"%s\"", phar->fname);
 					return;
 				}
 			} else {
@@ -1375,6 +1356,9 @@ nostub:
 	}
 
 	/* save modified files to the zip */
+	char *pass_error = NULL;
+	struct _phar_zip_pass pass;
+	pass.error = &pass_error;
 	pass.old = oldfile;
 	pass.filefp = php_stream_fopen_tmpfile();
 
@@ -1383,9 +1367,7 @@ fperror:
 		if (must_close_old_file) {
 			php_stream_close(oldfile);
 		}
-		if (error) {
-			spprintf(error, 4096, "phar zip flush of \"%s\" failed: unable to open temporary file", phar->fname);
-		}
+		spprintf(error, 4096, "phar zip flush of \"%s\" failed: unable to open temporary file", phar->fname);
 		return;
 	}
 
@@ -1413,13 +1395,11 @@ fperror:
 	zend_hash_apply_with_argument(&phar->manifest, phar_zip_changed_apply, (void *) &pass);
 
 	phar_metadata_tracker_try_ensure_has_serialized_data(&phar->metadata_tracker, phar->is_persistent);
-	if (temperr) {
-temperror:
-		if (error) {
-			spprintf(error, 4096, "phar zip flush of \"%s\" failed: %s", phar->fname, temperr);
-		}
-		efree(temperr);
-notemperror:
+	if (pass_error) {
+has_pass_error:
+		spprintf(error, 4096, "phar zip flush of \"%s\" failed: %s", phar->fname, pass_error);
+		efree(pass_error);
+nopasserror:
 		php_stream_close(pass.centralfp);
 nocentralerror:
 		php_stream_close(pass.filefp);
@@ -1430,7 +1410,8 @@ nocentralerror:
 	}
 
 	if (FAILURE == phar_zip_applysignature(phar, &pass)) {
-		goto temperror;
+		ZEND_ASSERT(pass_error != NULL);
+		goto has_pass_error;
 	}
 
 	/* save zip */
@@ -1444,10 +1425,8 @@ nocentralerror:
 		size_t clen;
 		zend_result ret = php_stream_copy_to_stream_ex(pass.centralfp, pass.filefp, PHP_STREAM_COPY_ALL, &clen);
 		if (SUCCESS != ret || clen != cdir_size) {
-			if (error) {
-				spprintf(error, 4096, "phar zip flush of \"%s\" failed: unable to write central-directory", phar->fname);
-			}
-			goto notemperror;
+			spprintf(error, 4096, "phar zip flush of \"%s\" failed: unable to write central-directory", phar->fname);
+			goto nopasserror;
 		}
 	}
 
@@ -1459,23 +1438,17 @@ nocentralerror:
 		PHAR_SET_16(eocd.comment_len, ZSTR_LEN(phar->metadata_tracker.str));
 
 		if (sizeof(eocd) != php_stream_write(pass.filefp, (char *)&eocd, sizeof(eocd))) {
-			if (error) {
-				spprintf(error, 4096, "phar zip flush of \"%s\" failed: unable to write end of central-directory", phar->fname);
-			}
+			spprintf(error, 4096, "phar zip flush of \"%s\" failed: unable to write end of central-directory", phar->fname);
 			goto nocentralerror;
 		}
 
 		if (ZSTR_LEN(phar->metadata_tracker.str) != php_stream_write(pass.filefp, ZSTR_VAL(phar->metadata_tracker.str), ZSTR_LEN(phar->metadata_tracker.str))) {
-			if (error) {
-				spprintf(error, 4096, "phar zip flush of \"%s\" failed: unable to write metadata to zip comment", phar->fname);
-			}
+			spprintf(error, 4096, "phar zip flush of \"%s\" failed: unable to write metadata to zip comment", phar->fname);
 			goto nocentralerror;
 		}
 	} else {
 		if (sizeof(eocd) != php_stream_write(pass.filefp, (char *)&eocd, sizeof(eocd))) {
-			if (error) {
-				spprintf(error, 4096, "phar zip flush of \"%s\" failed: unable to write end of central-directory", phar->fname);
-			}
+			spprintf(error, 4096, "phar zip flush of \"%s\" failed: unable to write end of central-directory", phar->fname);
 			goto nocentralerror;
 		}
 	}
@@ -1504,9 +1477,7 @@ nocentralerror:
 				php_stream_close(oldfile);
 			}
 			phar->fp = pass.filefp;
-			if (error) {
-				spprintf(error, 4096, "unable to open new phar \"%s\" for writing", phar->fname);
-			}
+			spprintf(error, 4096, "unable to open new phar \"%s\" for writing", phar->fname);
 			return;
 		}
 		php_stream_rewind(pass.filefp);