blob: 6043250863793899f0c6b2f4fc5a4fb76400934d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 22786c74700c1f0da7747ccea128e6400f0ce289 Mon Sep 17 00:00:00 2001
From: neeke <neeke@php.net>
Date: Tue, 19 Sep 2017 14:27:06 +0800
Subject: [PATCH] Fixed #152 (Segfault in cli)
---
src/Request.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/Request.c b/src/Request.c
index 57f14f0..1817219 100644
--- a/src/Request.c
+++ b/src/Request.c
@@ -180,15 +180,26 @@ static int seaslog_init_request_variable(TSRMLS_D)
static void seaslog_clear_request_variable(TSRMLS_D)
{
- SEASLOG_ZVAL_PTR_DTOR(SEASLOG_G(request_variable)->request_uri);
-
- if( SEASLOG_G(request_variable)->request_method )
+ if(SEASLOG_G(request_variable)->request_uri)
+ {
+ SEASLOG_ZVAL_PTR_DTOR(SEASLOG_G(request_variable)->request_uri);
+ }
+
+ if(SEASLOG_G(request_variable)->request_method)
{
SEASLOG_ZVAL_PTR_DTOR(SEASLOG_G(request_variable)->request_method);
}
-
- efree(SEASLOG_G(request_variable)->domain_port);
- efree(SEASLOG_G(request_variable)->client_ip);
+
+ if(SEASLOG_G(request_variable)->domain_port)
+ {
+ efree(SEASLOG_G(request_variable)->domain_port);
+ }
+
+ if(SEASLOG_G(request_variable)->client_ip)
+ {
+ efree(SEASLOG_G(request_variable)->client_ip);
+ }
+
efree(SEASLOG_G(request_variable));
}
|
