mirror of
https://github.com/chylex/Nextcloud-Desktop.git
synced 2025-08-16 22:31:42 +02:00
admin
osx
qt
patches
0001-Fix-crash-on-Mac-OS-if-PAC-URL-contains-non-URL-lega.patch
0002-Fix-possible-crash-when-passing-an-invalid-PAC-URL.patch
0003-Fix-crash-if-PAC-script-retrieval-returns-a-null-CFD.patch
0004-Cocoa-Fix-systray-SVG-icons.patch
0005-OSX-Fix-disapearing-tray-icon.patch
0006-Fix-force-debug-info-with-macx-clang_NOUPSTREAM.patch
0007-QNAM-Fix-upload-corruptions-when-server-closes-conne.patch
0007-X-Network-Fix-up-previous-corruption-patch.patch
0008-QNAM-Fix-reply-deadlocks-on-server-closing-connectio.patch
0009-QNAM-Assign-proper-channel-before-sslErrors-emission.patch
0010-Don-t-let-closed-http-sockets-pass-as-valid-connecti.patch
0011-Make-sure-to-report-correct-NetworkAccessibility.patch
0012-Make-sure-networkAccessibilityChanged-is-emitted.patch
0013-Make-UnknownAccessibility-not-block-requests.patch
0015-Remove-legacy-platform-code-in-QSslSocket-for-OS-X-1.patch
0016-QSslSocket-evaluate-CAs-in-all-keychain-categories.patch
0017-Win32-Re-init-system-proxy-if-internet-settings-chan.patch
0018-Windows-Do-not-crash-if-SSL-context-is-gone-after-ro.patch
0019-Ensure-system-tray-icon-is-prepared-even-when-menu-bar.patch
README.md
win
CMakeLists.txt
binary
cmake
csync
doc
resources
shell_integration
src
test
theme
translations
.gitattributes
.gitignore
.gitmodules
.tag
.travis.yml
CMakeLists.txt
CONTRIBUTING.md
COPYING
COPYING.documentation
CPackOptions.cmake.in
ChangeLog
Jenkinsfile
OWNCLOUD.cmake
OwnCloudCPack.cmake
README.md
VERSION.cmake
client.qrc
config.h.in
issue_template.md
mirall.desktop.in
sync-exclude.lst
theme.qrc
40 lines
1.8 KiB
Diff
40 lines
1.8 KiB
Diff
From 83bd9393e5564ea9168fda90c0f44456633a483a Mon Sep 17 00:00:00 2001
|
|
From: Daniel Molkentin <daniel@molkentin.de>
|
|
Date: Mon, 5 Jan 2015 15:22:57 +0100
|
|
Subject: [PATCH 3/3] Fix crash if PAC script retrieval returns a null CFData
|
|
instance
|
|
|
|
The documentation for CFURLCreateDataAndPropertiesFromResource()
|
|
does not make this clear but from looking at the CFNetwork implementation
|
|
and a user stacktrace it appears that this function can return true
|
|
but not set the data argument under certain circumstances.
|
|
|
|
Change-Id: I48034a640d6f47a51cd5883bbafacad4bcbd0415
|
|
Task-number: QTBUG-36787
|
|
Patch-By: Robert Knight
|
|
Reviewed-by: Markus Goetz <markus@woboq.com>
|
|
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
|
|
---
|
|
src/network/kernel/qnetworkproxy_mac.cpp | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/network/kernel/qnetworkproxy_mac.cpp b/src/network/kernel/qnetworkproxy_mac.cpp
|
|
index 6be032e..a1ac349 100644
|
|
--- a/src/network/kernel/qnetworkproxy_mac.cpp
|
|
+++ b/src/network/kernel/qnetworkproxy_mac.cpp
|
|
@@ -240,7 +240,10 @@ QList<QNetworkProxy> macQueryInternal(const QNetworkProxyQuery &query)
|
|
qWarning("Unable to get the PAC script at \"%s\" (%s)", qPrintable(pacLocation), cfurlErrorDescription(errorCode));
|
|
return result;
|
|
}
|
|
-
|
|
+ if (!pacData) {
|
|
+ qWarning("\"%s\" returned an empty PAC script", qPrintable(QCFString::toQString(cfPacLocation)));
|
|
+ return result;
|
|
+ }
|
|
QCFType<CFStringRef> pacScript = CFStringCreateFromExternalRepresentation(kCFAllocatorDefault, pacData, kCFStringEncodingISOLatin1);
|
|
if (!pacScript) {
|
|
// This should never happen, but the documentation says it may return NULL if there was a problem creating the object.
|
|
--
|
|
1.8.3.4 (Apple Git-47)
|
|
|