diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index ad61cba6c97..ecfe7a9249c 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -1343,10 +1343,10 @@ int main(int argc, char **argv) /* {{{ */
 	struct sigaction signal_struct;
 	signal_struct.sa_sigaction = phpdbg_signal_handler;
 	signal_struct.sa_flags = SA_SIGINFO | SA_NODEFER;
-	signal_struct.sa_mask = 0;
+	sigemptyset(&signal_struct.sa_mask);
 	sigio_struct.sa_sigaction = phpdbg_sigio_handler;
 	sigio_struct.sa_flags = SA_SIGINFO;
-	sigio_struct.sa_mask = 0;
+	sigemptyset(&sigio_struct.sa_mask);
 
 	address = strdup("127.0.0.1");
 #endif
diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c
index 3a7761cc64c..6d5e8949303 100644
--- a/sapi/phpdbg/phpdbg_list.c
+++ b/sapi/phpdbg/phpdbg_list.c
@@ -299,7 +299,9 @@ zend_op_array *phpdbg_compile_file(zend_file_handle *file, int type) {
 	return ret;
 }
 
-void phpdbg_free_file_source(phpdbg_file_source *data) {
+void phpdbg_free_file_source(zval *zv) {
+	phpdbg_file_source *data = Z_PTR_P(zv);
+
 #if HAVE_MMAP
 	if (data->map) {
 		munmap(data->map, data->len + ZEND_MMAP_AHEAD);