|
|
2d23cf6 |
From 6efcbd3fa0944b499180c7bc860d38c1b18c97f1 Mon Sep 17 00:00:00 2001
|
|
|
2d23cf6 |
From: Fabian Vogt <fabian@ritter-vogt.de>
|
|
|
2d23cf6 |
Date: Tue, 16 Feb 2016 22:13:56 +0100
|
|
|
2d23cf6 |
Subject: [PATCH] Fix mismatched new[]/delete in pacrunner_natus and _webkit
|
|
|
2d23cf6 |
|
|
|
2d23cf6 |
---
|
|
|
2d23cf6 |
libproxy/modules/pacrunner_natus.cpp | 4 ++--
|
|
|
2d23cf6 |
libproxy/modules/pacrunner_webkit.cpp | 6 +++---
|
|
|
2d23cf6 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
2d23cf6 |
|
|
|
2d23cf6 |
diff --git a/libproxy/modules/pacrunner_natus.cpp b/libproxy/modules/pacrunner_natus.cpp
|
|
|
2d23cf6 |
index ce79943..72ef6ff 100644
|
|
|
2d23cf6 |
--- a/libproxy/modules/pacrunner_natus.cpp
|
|
|
2d23cf6 |
+++ b/libproxy/modules/pacrunner_natus.cpp
|
|
|
2d23cf6 |
@@ -43,14 +43,14 @@ static Value dnsResolve(Value& ths, Value& fnc, vector<Value>& arg) {
|
|
|
2d23cf6 |
NULL, 0,
|
|
|
2d23cf6 |
NI_NUMERICHOST)) {
|
|
|
2d23cf6 |
freeaddrinfo(info);
|
|
|
2d23cf6 |
- delete tmp;
|
|
|
2d23cf6 |
+ delete[] tmp;
|
|
|
2d23cf6 |
return NULL;
|
|
|
2d23cf6 |
}
|
|
|
2d23cf6 |
freeaddrinfo(info);
|
|
|
2d23cf6 |
|
|
|
2d23cf6 |
// Create the return value
|
|
|
2d23cf6 |
Value ret = ths.newString(tmp);
|
|
|
2d23cf6 |
- delete tmp;
|
|
|
2d23cf6 |
+ delete[] tmp;
|
|
|
2d23cf6 |
return ret;
|
|
|
2d23cf6 |
}
|
|
|
2d23cf6 |
|
|
|
2d23cf6 |
diff --git a/libproxy/modules/pacrunner_webkit.cpp b/libproxy/modules/pacrunner_webkit.cpp
|
|
|
2d23cf6 |
index c51b869..bef2056 100644
|
|
|
2d23cf6 |
--- a/libproxy/modules/pacrunner_webkit.cpp
|
|
|
2d23cf6 |
+++ b/libproxy/modules/pacrunner_webkit.cpp
|
|
|
2d23cf6 |
@@ -58,7 +58,7 @@ static JSValueRef dnsResolve(JSContextRef ctx, JSObjectRef /*func*/, JSObjectRef
|
|
|
2d23cf6 |
struct addrinfo *info;
|
|
|
2d23cf6 |
if (getaddrinfo(tmp, NULL, NULL, &info))
|
|
|
2d23cf6 |
return NULL;
|
|
|
2d23cf6 |
- delete tmp;
|
|
|
2d23cf6 |
+ delete[] tmp;
|
|
|
2d23cf6 |
|
|
|
2d23cf6 |
// Try for IPv4
|
|
|
2d23cf6 |
tmp = new char[INET6_ADDRSTRLEN+1];
|
|
|
2d23cf6 |
@@ -67,7 +67,7 @@ static JSValueRef dnsResolve(JSContextRef ctx, JSObjectRef /*func*/, JSObjectRef
|
|
|
2d23cf6 |
NULL, 0,
|
|
|
2d23cf6 |
NI_NUMERICHOST)) {
|
|
|
2d23cf6 |
freeaddrinfo(info);
|
|
|
2d23cf6 |
- delete tmp;
|
|
|
2d23cf6 |
+ delete[] tmp;
|
|
|
2d23cf6 |
return NULL;
|
|
|
2d23cf6 |
}
|
|
|
2d23cf6 |
freeaddrinfo(info);
|
|
|
2d23cf6 |
@@ -76,7 +76,7 @@ static JSValueRef dnsResolve(JSContextRef ctx, JSObjectRef /*func*/, JSObjectRef
|
|
|
2d23cf6 |
JSStringRef str = JSStringCreateWithUTF8CString(tmp);
|
|
|
2d23cf6 |
JSValueRef ret = JSValueMakeString(ctx, str);
|
|
|
2d23cf6 |
JSStringRelease(str);
|
|
|
2d23cf6 |
- delete tmp;
|
|
|
2d23cf6 |
+ delete[] tmp;
|
|
|
2d23cf6 |
|
|
|
2d23cf6 |
return ret;
|
|
|
2d23cf6 |
}
|