zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of move some warning suppressions from SocketRocket. (patchset #2 id:70001 of https://codereview.webrtc.org/2718653002/ )

Browse Source 
Reason for revert:
Breaks AppRTCMobile in release configuration

Original issue's description:
> Reland of move some warning suppressions from SocketRocket. (patchset #1 id:1 of https://codereview.webrtc.org/2714123002/ )
>
> Reason for revert:
> Buildbot issues have been fixed.
>
> Original issue's description:
> > Revert of Remove some warning suppressions from SocketRocket. (patchset #1 id:1 of https://codereview.webrtc.org/2704383004/ )
> >
> > Reason for revert:
> > Breaks buildbot
> >
> > Original issue's description:
> > > Remove some warning suppressions from SocketRocket.
> > >
> > > These warnings started appearing on a clang update. This CL patches the
> > > vendored library and removes the supression. We assert on the return as
> > > we're not equipped to deal with failures there anyway.
> > >
> > > BUG=webrtc:6396
> > > NOTRY=true
> > >
> > > Review-Url: https://codereview.webrtc.org/2704383004
> > > Cr-Commit-Position: refs/heads/master@{#16820}
> > > Committed: 49990e88fb
> >
> > TBR=kjellander@webrtc.org,magjed@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:6396
> >
> > Review-Url: https://codereview.webrtc.org/2714123002
> > Cr-Commit-Position: refs/heads/master@{#16822}
> > Committed: e47de1a69c
>
> TBR=kjellander@webrtc.org,magjed@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6396
>
> Review-Url: https://codereview.webrtc.org/2718653002
> Cr-Commit-Position: refs/heads/master@{#16823}
> Committed: 00df91ce50

TBR=kjellander@webrtc.org,magjed@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6396

Review-Url: https://codereview.webrtc.org/2718703002
Cr-Commit-Position: refs/heads/master@{#16829}
This commit is contained in:
kthelgason
2017-02-24 08:06:17 -08:00
committed by Commit bot
parent 1498defa78
commit 0b34577625
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/examples/BUILD.gn
View File

@ -399,6 +399,10 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
cflags_objc = [ cflags_objc = [
# Enabled for cflags_objc in build/config/compiler/BUILD.gn. # Enabled for cflags_objc in build/config/compiler/BUILD.gn.
"-Wno-objc-missing-property-synthesis", "-Wno-objc-missing-property-synthesis",
# Hide the warning for SecRandomCopyBytes(), until we update to upstream.
# https://bugs.chromium.org/p/webrtc/issues/detail?id=6396
"-Wno-unused-result",
] ]
} }

6
webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/SRWebSocket.m vendored
View File

@ -504,7 +504,7 @@ static __strong NSData *CRLFCRLF;
CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Host"), (__bridge CFStringRef)(_url.port ? [NSString stringWithFormat:@"%@:%@", _url.host, _url.port] : _url.host)); CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Host"), (__bridge CFStringRef)(_url.port ? [NSString stringWithFormat:@"%@:%@", _url.host, _url.port] : _url.host));
NSMutableData *keyBytes = [[NSMutableData alloc] initWithLength:16]; NSMutableData *keyBytes = [[NSMutableData alloc] initWithLength:16];
assert(!SecRandomCopyBytes(kSecRandomDefault, keyBytes.length, keyBytes.mutableBytes)); SecRandomCopyBytes(kSecRandomDefault, keyBytes.length, keyBytes.mutableBytes);
if ([keyBytes respondsToSelector:@selector(base64EncodedStringWithOptions:)]) { if ([keyBytes respondsToSelector:@selector(base64EncodedStringWithOptions:)]) {
_secKey = [keyBytes base64EncodedStringWithOptions:0]; _secKey = [keyBytes base64EncodedStringWithOptions:0];
@ -528,7 +528,7 @@ static __strong NSData *CRLFCRLF;
[_urlRequest.allHTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) { [_urlRequest.allHTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
CFHTTPMessageSetHeaderFieldValue(request, (__bridge CFStringRef)key, (__bridge CFStringRef)obj); CFHTTPMessageSetHeaderFieldValue(request, (__bridge CFStringRef)key, (__bridge CFStringRef)obj);
}]; }];
NSData *message = CFBridgingRelease(CFHTTPMessageCopySerializedMessage(request)); NSData *message = CFBridgingRelease(CFHTTPMessageCopySerializedMessage(request));
CFRelease(request); CFRelease(request);
@ -1361,7 +1361,7 @@ static const size_t SRFrameHeaderOverhead = 32;
} }
} else { } else {
uint8_t *mask_key = frame_buffer + frame_buffer_size; uint8_t *mask_key = frame_buffer + frame_buffer_size;
assert(!SecRandomCopyBytes(kSecRandomDefault, sizeof(uint32_t), (uint8_t *)mask_key)); SecRandomCopyBytes(kSecRandomDefault, sizeof(uint32_t), (uint8_t *)mask_key);
frame_buffer_size += sizeof(uint32_t); frame_buffer_size += sizeof(uint32_t);
// TODO: could probably optimize this with SIMD // TODO: could probably optimize this with SIMD