mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
95 lines
4.4 KiB
C++
95 lines
4.4 KiB
C++
$NetBSD: patch-netwerk_protocol_http_Http2Session.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $
|
|
|
|
https://bugzilla.mozilla.org/show_bug.cgi?id=1130822
|
|
Fix obivous alignment issues (causing crashes on some architectures).
|
|
|
|
--- netwerk/protocol/http/Http2Session.cpp.orig 2015-02-17 21:40:50.000000000 +0000
|
|
+++ netwerk/protocol/http/Http2Session.cpp
|
|
@@ -32,7 +32,6 @@
|
|
#include "nsStandardURL.h"
|
|
#include "nsURLHelper.h"
|
|
#include "prprf.h"
|
|
-#include "prnetdb.h"
|
|
#include "sslt.h"
|
|
|
|
#ifdef DEBUG
|
|
@@ -1295,7 +1294,7 @@ Http2Session::RecvPriority(Http2Session
|
|
return rv;
|
|
|
|
uint32_t newPriorityDependency =
|
|
- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
|
|
+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes);
|
|
bool exclusive = !!(newPriorityDependency & 0x80000000);
|
|
newPriorityDependency &= 0x7fffffff;
|
|
uint8_t newPriorityWeight = *(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4);
|
|
@@ -1326,7 +1325,7 @@ Http2Session::RecvRstStream(Http2Session
|
|
}
|
|
|
|
self->mDownstreamRstReason =
|
|
- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
|
|
+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes);
|
|
|
|
LOG3(("Http2Session::RecvRstStream %p RST_STREAM Reason Code %u ID %x\n",
|
|
self, self->mDownstreamRstReason, self->mInputFrameID));
|
|
@@ -1387,8 +1386,8 @@ Http2Session::RecvSettings(Http2Session
|
|
uint8_t *setting = reinterpret_cast<uint8_t *>
|
|
(self->mInputFrameBuffer.get()) + kFrameHeaderBytes + index * 6;
|
|
|
|
- uint16_t id = PR_ntohs(*reinterpret_cast<uint16_t *>(setting));
|
|
- uint32_t value = PR_ntohl(*reinterpret_cast<uint32_t *>(setting + 2));
|
|
+ uint16_t id = NS_decodeN16(setting);
|
|
+ uint32_t value = NS_decodeN32(setting + 2);
|
|
LOG3(("Settings ID %u, Value %u", id, value));
|
|
|
|
switch (id)
|
|
@@ -1473,7 +1472,7 @@ Http2Session::RecvPushPromise(Http2Sessi
|
|
}
|
|
promiseLen = 4;
|
|
promisedID =
|
|
- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes + paddingControlBytes));
|
|
+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes + paddingControlBytes);
|
|
promisedID &= 0x7fffffff;
|
|
}
|
|
|
|
@@ -1733,11 +1732,11 @@ Http2Session::RecvGoAway(Http2Session *s
|
|
|
|
self->mShouldGoAway = true;
|
|
self->mGoAwayID =
|
|
- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
|
|
+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes);
|
|
self->mGoAwayID &= 0x7fffffff;
|
|
self->mCleanShutdown = true;
|
|
uint32_t statusCode =
|
|
- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4));
|
|
+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes + 4);
|
|
|
|
// Find streams greater than the last-good ID and mark them for deletion
|
|
// in the mGoAwayStreamsToRestart queue with the GoAwayEnumerator. The
|
|
@@ -1809,7 +1808,7 @@ Http2Session::RecvWindowUpdate(Http2Sess
|
|
}
|
|
|
|
uint32_t delta =
|
|
- PR_ntohl(*reinterpret_cast<uint32_t *>(self->mInputFrameBuffer.get() + kFrameHeaderBytes));
|
|
+ NS_decodeN32(self->mInputFrameBuffer.get() + kFrameHeaderBytes);
|
|
delta &= 0x7fffffff;
|
|
|
|
LOG3(("Http2Session::RecvWindowUpdate %p len=%d Stream 0x%X.\n",
|
|
@@ -2453,7 +2452,7 @@ Http2Session::WriteSegments(nsAHttpSegme
|
|
|
|
// 3 bytes of length, 1 type byte, 1 flag byte, 1 unused bit, 31 bits of ID
|
|
uint8_t totallyWastedByte = mInputFrameBuffer.get()[0];
|
|
- mInputFrameDataSize = PR_ntohs(*reinterpret_cast<uint16_t *>(mInputFrameBuffer.get() + 1));
|
|
+ mInputFrameDataSize = NS_decodeN16(mInputFrameBuffer.get() + 1);
|
|
if (totallyWastedByte || (mInputFrameDataSize > kMaxFrameData)) {
|
|
LOG3(("Got frame too large 0x%02X%04X", totallyWastedByte, mInputFrameDataSize));
|
|
RETURN_SESSION_ERROR(this, PROTOCOL_ERROR);
|
|
@@ -2461,7 +2460,7 @@ Http2Session::WriteSegments(nsAHttpSegme
|
|
mInputFrameType = *reinterpret_cast<uint8_t *>(mInputFrameBuffer.get() + kFrameLengthBytes);
|
|
mInputFrameFlags = *reinterpret_cast<uint8_t *>(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes);
|
|
mInputFrameID =
|
|
- PR_ntohl(*reinterpret_cast<uint32_t *>(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes + kFrameFlagBytes));
|
|
+ NS_decodeN32(mInputFrameBuffer.get() + kFrameLengthBytes + kFrameTypeBytes + kFrameFlagBytes);
|
|
mInputFrameID &= 0x7fffffff;
|
|
mInputFrameDataRead = 0;
|
|
|