mirror of
https://github.com/nextcloud/desktop.git
synced 2024-12-16 19:04:43 +03:00
39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
|
From a83e4d1d9dd90d4563ce60f27dfb7802a780e33e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Molkentin <daniel@molkentin.de>
|
||
|
|
Date: Mon, 5 Jan 2015 11:42:52 +0100
|
||
|
|
Subject: [PATCH 2/3] Fix possible crash when passing an invalid PAC URL
|
||
|
|
|
||
|
|
This commit checks whether CFURLCreateWithString() succeeded.
|
||
|
|
|
||
|
|
It does not appear to be possible to enter an empty URL directly in the
|
||
|
|
PAC configuration dialog but I can't rule out the possibility
|
||
|
|
that it could find its way into the settings via some other means.
|
||
|
|
|
||
|
|
Change-Id: I6c2053d385503bf0330f5ae9fb1ec36a473d425d
|
||
|
|
Patch-By: Robert Knight
|
||
|
|
Task-number: QTBUG-36787
|
||
|
|
Reviewed-by: Markus Goetz <markus@woboq.com>
|
||
|
|
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
|
||
|
|
---
|
||
|
|
src/network/kernel/qnetworkproxy_mac.cpp | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp
|
||
|
|
index 81bce0c..6be032e 100644
|
||
|
|
--- a/src/network/kernel/qnetworkproxy_mac.cpp
|
||
|
|
+++ b/src/network/kernel/qnetworkproxy_mac.cpp
|
||
|
|
@@ -230,6 +230,10 @@ QList<QNetworkProxy> macQueryInternal(const QNetworkProxyQuery &query)
|
||
|
|
if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) {
|
||
|
|
QCFType<CFDataRef> pacData;
|
||
|
|
QCFType<CFURLRef> pacUrl = CFURLCreateWithString(kCFAllocatorDefault, cfPacLocation, NULL);
|
||
|
|
+ if (!pacUrl) {
|
||
|
|
+ qWarning("Invalid PAC URL \"%s\"", qPrintable(QCFString::toQString(cfPacLocation)));
|
||
|
|
+ return result;
|
||
|
|
+ }
|
||
|
|
SInt32 errorCode;
|
||
|
|
if (!CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, pacUrl, &pacData, NULL, NULL, &errorCode)) {
|
||
|
|
QString pacLocation = QCFString::toQString(cfPacLocation);
|
||
|
|
--
|
||
|
|
1.8.3.4 (Apple Git-47)
|
||
|
|
|