diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-28 23:10:30 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-28 23:10:30 +0100 |
| commit | 088c3cf890cc2d96f2093e2116612cbf65bfaeea (patch) | |
| tree | b4d3c68155f2de43432dd00c167d3029732be146 /netwerk/protocol/http/nsHttpPipeline.cpp | |
| parent | ec3829bf7266ebec111f41268c6c491356576df1 (diff) | |
| parent | fe11e14d3cfc2900facf152257acda87280b6cdc (diff) | |
| download | UXP-088c3cf890cc2d96f2093e2116612cbf65bfaeea.tar UXP-088c3cf890cc2d96f2093e2116612cbf65bfaeea.tar.gz UXP-088c3cf890cc2d96f2093e2116612cbf65bfaeea.tar.lz UXP-088c3cf890cc2d96f2093e2116612cbf65bfaeea.tar.xz UXP-088c3cf890cc2d96f2093e2116612cbf65bfaeea.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'netwerk/protocol/http/nsHttpPipeline.cpp')
| -rw-r--r-- | netwerk/protocol/http/nsHttpPipeline.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/netwerk/protocol/http/nsHttpPipeline.cpp b/netwerk/protocol/http/nsHttpPipeline.cpp index 293de8e39..4f5777244 100644 --- a/netwerk/protocol/http/nsHttpPipeline.cpp +++ b/netwerk/protocol/http/nsHttpPipeline.cpp @@ -291,6 +291,11 @@ nsHttpPipeline::PushBack(const char *data, uint32_t length) MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread); MOZ_ASSERT(mPushBackLen == 0, "push back buffer already has data!"); + // Some bad behaving proxies may yank the connection out from under us. + // Check if we still have a connection to work with. + if (!mConnection) + return NS_ERROR_FAILURE; + // If we have no chance for a pipeline (e.g. due to an Upgrade) // then push this data down to original connection if (!mConnection->IsPersistent()) |