Resurrect an old patch (#1459779)
This commit is contained in:
parent
bbad3090f7
commit
3c22017d44
41
libproxy-0.4.11-crash.patch
Normal file
41
libproxy-0.4.11-crash.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
diff -up libproxy-0.4.11/libproxy/extension_pacrunner.cpp.crash libproxy-0.4.11/libproxy/extension_pacrunner.cpp
|
||||||
|
--- libproxy-0.4.11/libproxy/extension_pacrunner.cpp.crash 2010-07-29 08:14:59.000000000 -0400
|
||||||
|
+++ libproxy-0.4.11/libproxy/extension_pacrunner.cpp 2013-11-11 15:23:56.987266457 -0500
|
||||||
|
@@ -22,20 +22,10 @@ using namespace libproxy;
|
||||||
|
|
||||||
|
pacrunner::pacrunner(string, const url&) {}
|
||||||
|
|
||||||
|
-pacrunner_extension::pacrunner_extension() {
|
||||||
|
- this->pr = NULL;
|
||||||
|
-}
|
||||||
|
+pacrunner_extension::pacrunner_extension() {}
|
||||||
|
|
||||||
|
-pacrunner_extension::~pacrunner_extension() {
|
||||||
|
- if (this->pr) delete this->pr;
|
||||||
|
-}
|
||||||
|
+pacrunner_extension::~pacrunner_extension() {}
|
||||||
|
|
||||||
|
pacrunner* pacrunner_extension::get(string pac, const url& pacurl) throw (bad_alloc) {
|
||||||
|
- if (this->pr) {
|
||||||
|
- if (this->last == pac)
|
||||||
|
- return this->pr;
|
||||||
|
- delete this->pr;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- return this->pr = this->create(pac, pacurl);
|
||||||
|
+ return this->create(pac, pacurl);
|
||||||
|
}
|
||||||
|
diff -up libproxy-0.4.11/libproxy/proxy.cpp.crash libproxy-0.4.11/libproxy/proxy.cpp
|
||||||
|
--- libproxy-0.4.11/libproxy/proxy.cpp.crash 2013-11-11 15:25:27.309271353 -0500
|
||||||
|
+++ libproxy-0.4.11/libproxy/proxy.cpp 2013-11-11 15:25:31.569271584 -0500
|
||||||
|
@@ -416,7 +416,9 @@ void proxy_factory::run_pac(url &realurl
|
||||||
|
|
||||||
|
/* Run the PAC, but only try one PACRunner */
|
||||||
|
if (debug) cerr << "Using pacrunner: " << typeid(*pacrunners[0]).name() << endl;
|
||||||
|
- string pacresp = pacrunners[0]->get(this->pac, this->pacurl->to_string())->run(realurl);
|
||||||
|
+ pacrunner* runner = pacrunners[0]->get(this->pac, this->pacurl->to_string());
|
||||||
|
+ string pacresp = runner->run(realurl);
|
||||||
|
+ delete runner;
|
||||||
|
if (debug) cerr << "Pacrunner returned: " << pacresp << endl;
|
||||||
|
format_pac_response(pacresp, response);
|
||||||
|
}
|
@ -1,12 +0,0 @@
|
|||||||
diff -up libproxy-0.4.11/libproxy/extension_pacrunner.cpp.mozjscrash libproxy-0.4.11/libproxy/extension_pacrunner.cpp
|
|
||||||
--- libproxy-0.4.11/libproxy/extension_pacrunner.cpp.mozjscrash 2010-07-29 08:14:59.000000000 -0400
|
|
||||||
+++ libproxy-0.4.11/libproxy/extension_pacrunner.cpp 2013-09-19 09:22:13.031263766 -0400
|
|
||||||
@@ -35,6 +35,7 @@ pacrunner* pacrunner_extension::get(stri
|
|
||||||
if (this->last == pac)
|
|
||||||
return this->pr;
|
|
||||||
delete this->pr;
|
|
||||||
+ this->pr = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return this->pr = this->create(pac, pacurl);
|
|
||||||
diff -up libproxy-0.4.11/libproxy/modules/pacrunner_mozjs.cpp.mozjscrash libproxy-0.4.11/libproxy/modules/pacrunner_mozjs.cpp
|
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Name: libproxy
|
Name: libproxy
|
||||||
Version: 0.4.15
|
Version: 0.4.15
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: A library handling all the details of proxy configuration
|
Summary: A library handling all the details of proxy configuration
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -15,7 +15,7 @@ Source0: https://github.com/libproxy/%{name}/archive/%{version}.tar.gz
|
|||||||
Source1: proxy.1
|
Source1: proxy.1
|
||||||
# http://code.google.com/p/libproxy/issues/detail?id=152
|
# http://code.google.com/p/libproxy/issues/detail?id=152
|
||||||
Patch0: 0001-Add-config-module-for-querying-PacRunner-d-mon.patch
|
Patch0: 0001-Add-config-module-for-querying-PacRunner-d-mon.patch
|
||||||
Patch1: libproxy-pacrunner-crash-fix.patch
|
Patch1: libproxy-0.4.11-crash.patch
|
||||||
|
|
||||||
BuildRequires: libmodman-devel >= 2.0.1
|
BuildRequires: libmodman-devel >= 2.0.1
|
||||||
BuildRequires: cmake >= 2.6.0
|
BuildRequires: cmake >= 2.6.0
|
||||||
@ -241,6 +241,9 @@ make test
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 04 2018 David King <amigadave@amigadave.com> - 0.4.15-6
|
||||||
|
- Resurrect an old patch (#1459779)
|
||||||
|
|
||||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.15-5
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.15-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user