From kde-commits  Sun Sep 23 22:43:16 2012
From: Dawit A <adawit () kde ! org>
Date: Sun, 23 Sep 2012 22:43:16 +0000
To: kde-commits
Subject: Re: [kdelibs/KDE/4.10] kio/kio: Always return a valid QNetworkReply instead of NULLPTR
Message-Id: <CALa28R70aynEJkX0u57D9PpSdMuCoYGL75wsLoO2OJ0Ea91oDQ () mail ! gmail ! com>
X-MARC-Message: https://marc.info/?l=kde-commits&m=134844024601962
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--f46d0447f3004cc61e04ca6635fd"

--f46d0447f3004cc61e04ca6635fd
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Did you push this fix into the 4.10 branch too ? If so, please make sure
you do not do that the next time. For kdelibs, you only need to push the
fix into the current stable branch (4.9) and someone will merge those
changes into the next stable branch (4.10).

On Sun, Sep 23, 2012 at 6:27 PM, Stefan Br=C3=BCns
<stefan.bruens@rwth-aachen.de>wrote:

> Git commit 098fed426b5936069e64141d1e4ca2082c28ce19 by Stefan Br=C3=BCns.
> Committed on 24/09/2012 at 00:26.
> Pushed by bruns into branch 'KDE/4.10'.
>
> Always return a valid QNetworkReply instead of NULLPTR
>
> Even when the request fails, a valid reply should be returned.
> At least WebCore crashes if the Accessmanager::createRequest(..)
> returns 0.
>
> REVIEW: 106502
> BUG: 259883
> BUG: 305516
>
> M  +1    -1    kio/kio/accessmanager.cpp
>
> http://commits.kde.org/kdelibs/098fed426b5936069e64141d1e4ca2082c28ce19
>
> diff --git a/kio/kio/accessmanager.cpp b/kio/kio/accessmanager.cpp
> index c27d90d..7a806e8 100644
> --- a/kio/kio/accessmanager.cpp
> +++ b/kio/kio/accessmanager.cpp
> @@ -332,7 +332,7 @@ QNetworkReply *AccessManager::createRequest(Operation
> op, const QNetworkRequest
>              kDebug(7044) << "Synchronous XHR:" << reply << reqUrl;
>          } else {
>              kWarning(7044) << "Failed to create a synchronous XHR for" <=
<
> reqUrl;
> -            reply =3D 0;
> +            reply =3D new KDEPrivate::AccessManagerReply(op, req,
> QNetworkReply::UnknownNetworkError, kioJob->errorText(), this);
>          }
>      } else {
>          // Set the window on the the KIO ui delegate
>

--f46d0447f3004cc61e04ca6635fd
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Did you push this fix into the 4.10 branch too ? If so, please make sure yo=
u do not do that the next time. For kdelibs, you only need to push the fix =
into the current stable branch (4.9) and someone will merge those changes i=
nto the next stable branch (4.10).<br>

<br><div class=3D"gmail_quote">
On Sun, Sep 23, 2012 at 6:27 PM, Stefan Br=C3=BCns <span dir=3D"ltr">&lt;<a=
 href=3D"mailto:stefan.bruens@rwth-aachen.de" target=3D"_blank">stefan.brue=
ns@rwth-aachen.de</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_quote=
" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">


Git commit 098fed426b5936069e64141d1e4ca2082c28ce19 by Stefan Br=C3=BCns.<b=
r>
Committed on 24/09/2012 at 00:26.<br>
Pushed by bruns into branch &#39;KDE/4.10&#39;.<br>
<div><br>
Always return a valid QNetworkReply instead of NULLPTR<br>
<br>
Even when the request fails, a valid reply should be returned.<br>
At least WebCore crashes if the Accessmanager::createRequest(..)<br>
returns 0.<br>
<br>
REVIEW: 106502<br>
BUG: 259883<br>
BUG: 305516<br>
<br>
</div>M =C2=A0+1 =C2=A0 =C2=A0-1 =C2=A0 =C2=A0kio/kio/accessmanager.cpp<br>
<br>
<a href=3D"http://commits.kde.org/kdelibs/098fed426b5936069e64141d1e4ca2082=
c28ce19" target=3D"_blank">http://commits.kde.org/kdelibs/098fed426b5936069=
e64141d1e4ca2082c28ce19</a><br>
<div><div><br>
diff --git a/kio/kio/accessmanager.cpp b/kio/kio/accessmanager.cpp<br>
index c27d90d..7a806e8 100644<br>
--- a/kio/kio/accessmanager.cpp<br>
+++ b/kio/kio/accessmanager.cpp<br>
@@ -332,7 +332,7 @@ QNetworkReply *AccessManager::createRequest(Operation o=
p, const QNetworkRequest<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kDebug(7044) &lt;&lt; &quot=
;Synchronous XHR:&quot; &lt;&lt; reply &lt;&lt; reqUrl;<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else {<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0kWarning(7044) &lt;&lt; &qu=
ot;Failed to create a synchronous XHR for&quot; &lt;&lt; reqUrl;<br>
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0reply =3D 0;<br>
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0reply =3D new KDEPrivate::Access=
ManagerReply(op, req, QNetworkReply::UnknownNetworkError, kioJob-&gt;errorT=
ext(), this);<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0} else {<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0// Set the window on the the KIO ui deleg=
ate<br>
</div></div></blockquote></div><br>

--f46d0447f3004cc61e04ca6635fd--