127701 2014-01-27 13:21:22 -0800 [iOS] Use callOnMainThread() not dispatch_async() in MediaPlayerPrivateAVFoundationObjC 2014-01-30 11:00:05 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson glenn jeremyj-wk philipj oldest_to_newest 972534 0 jer.noble 2014-01-27 13:21:22 -0800 [iOS] Use callOnMainThread() not dispatch_async() in MediaPlayerPrivateAVFoundationObjC 972548 1 222351 jer.noble 2014-01-27 13:49:04 -0800 Created attachment 222351 Patch 972549 2 222352 jer.noble 2014-01-27 13:52:11 -0800 Created attachment 222352 Patch 972553 3 222352 eric.carlson 2014-01-27 14:01:52 -0800 Comment on attachment 222352 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222352&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:2124 > + if (strongSelf->m_callback) > + strongSelf->m_callback->didCancelLoadingRequest(strongRequest.get()); Why do you use "strongSelf->m_callback" here, but just "m_callback" everywhere else? 972555 4 222355 jer.noble 2014-01-27 14:06:32 -0800 Created attachment 222355 Patch Now with more weakPtr. 972625 5 222355 commit-queue 2014-01-27 15:46:45 -0800 Comment on attachment 222355 Patch Clearing flags on attachment: 222355 Committed r162879: <http://trac.webkit.org/changeset/162879> 972993 6 jer.noble 2014-01-28 10:21:30 -0800 *** Bug 127758 has been marked as a duplicate of this bug. *** 222351 2014-01-27 13:49:04 -0800 2014-01-27 13:52:09 -0800 Patch bug-127701-20140127134904.patch text/plain 3877 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJkNzMyOGMzNDg5YmU3 NGVmOWZhNzkwMGM4ZGY4ZWFiNGY3MDNhZS4uMGRlYThkN2UwYzY2OGFiMDczOTVjY2EwZmFjZWYz MGY1YjEzYmViZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTAxLTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFVzZSBjYWxsT25N YWluVGhyZWFkKCkgbm90IGRpc3BhdGNoX2FzeW5jKCkgaW4gTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI3NzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgLi4uKSB1c2Vk IHRvIGJlIGZpbmUgc28gbG9uZyBhcyB0aGUgbWFpbgorICAgICAgICB0aHJlYWQgd2FzIGFsc28g dGhlIHdlYiB0aHJlYWQuIEJ1dCBzaW5jZSB0aGF0J3Mgbm90IHRoZSBjYXNlIG9uIGlPUywgd2Ug c2hvdWxkIGJlCisgICAgICAgIHVzaW5nIGNhbGxPbk1haW5UaHJlYWQoKSBpbnN0ZWFkIChiZWNh dXNlIGl0IGRpc3BhdGNoZXMgdG8gdGhlIHdlYiB0aHJlYWQsIG5vdCBhcworICAgICAgICBpdHMg bmFtZSBpbXBsaWVzLCB0aGUgbWFpbiB0aHJlYWQpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akM6OnNlZWtUb1RpbWUpOgorICAgICAgICAoLVtXZWJDb3JlQVZGTW92aWVPYnNlcnZlciBsZWdp YmxlT3V0cHV0OmRpZE91dHB1dEF0dHJpYnV0ZWRTdHJpbmdzOm5hdGl2ZVNhbXBsZUJ1ZmZlcnM6 Zm9ySXRlbVRpbWU6XSk6CisgICAgICAgICgtW1dlYkNvcmVBVkZNb3ZpZU9ic2VydmVyIG91dHB1 dFNlcXVlbmNlV2FzRmx1c2hlZDpdKToKKyAgICAgICAgKC1bV2ViQ29yZUFWRkxvYWRlckRlbGVn YXRlIHJlc291cmNlTG9hZGVyOnNob3VsZFdhaXRGb3JMb2FkaW5nT2ZSZXF1ZXN0ZWRSZXNvdXJj ZTpdKToKKyAgICAgICAgKC1bV2ViQ29yZUFWRkxvYWRlckRlbGVnYXRlIHJlc291cmNlTG9hZGVy OnNob3VsZFdhaXRGb3JSZXNwb25zZVRvQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6XSk6CisgICAg ICAgICgtW1dlYkNvcmVBVkZMb2FkZXJEZWxlZ2F0ZSByZXNvdXJjZUxvYWRlcjpkaWRDYW5jZWxM b2FkaW5nUmVxdWVzdDpdKToKKwogMjAxNC0wMS0yNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBSdW4gVXNlckFnZW50U2NyaXB0cyB0aHJvdWdoIGpzbWluIHJh dGhlciB0aGFuIHRoZSBjc3MgcHJlcHJvY2Vzc29yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRl eCAyNWY4NzI4ZDJmNDliZmYyODJhMmZjZDJkNjllMTc1YmU1Njk1NjRkLi5mNGE4YWJkNWI3MjIy ZDQxYjFhNTI1MjhlZjcyNTc1MTQyZjkyNzliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAg LTY5Niw3ICs2OTYsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6 OnNlZWtUb1RpbWUoZG91YmxlIHRpbWUsIGRvdWJsZSBuZWdhdGl2ZQogICAgIF9fYmxvY2sgYXV0 byB3ZWFrVGhpcyA9IGNyZWF0ZVdlYWtQdHIoKTsKIAogICAgIFttX2F2UGxheWVySXRlbS5nZXQo KSBzZWVrVG9UaW1lOmNtVGltZSB0b2xlcmFuY2VCZWZvcmU6Y21CZWZvcmUgdG9sZXJhbmNlQWZ0 ZXI6Y21BZnRlciBjb21wbGV0aW9uSGFuZGxlcjpeKEJPT0wgZmluaXNoZWQpIHsKLSAgICAgICAg ZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKKyAgICAgICAgY2Fs bE9uTWFpblRocmVhZCheewogICAgICAgICAgICAgYXV0byBfdGhpcyA9IHdlYWtUaGlzLmdldCgp OwogICAgICAgICAgICAgaWYgKCFfdGhpcykKICAgICAgICAgICAgICAgICByZXR1cm47CkBAIC0y MDI5LDcgKzIwMjksNyBAQCBOU0FycmF5KiBpdGVtS1ZPUHJvcGVydGllcygpCiAgICAgaWYgKCFt X2NhbGxiYWNrKQogICAgICAgICByZXR1cm47CiAKLSAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRj aF9nZXRfbWFpbl9xdWV1ZSgpLCBeeworICAgIGNhbGxPbk1haW5UaHJlYWQoXnsKICAgICAgICAg aWYgKCFtX2NhbGxiYWNrKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBtX2NhbGxiYWNr LT5wcm9jZXNzQ3VlKHN0cmluZ3MsIENNVGltZUdldFNlY29uZHMoaXRlbVRpbWUpKTsKQEAgLTIw NDMsNyArMjA0Myw3IEBAIE5TQXJyYXkqIGl0ZW1LVk9Qcm9wZXJ0aWVzKCkKICAgICBpZiAoIW1f Y2FsbGJhY2spCiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBkaXNwYXRjaF9hc3luYyhkaXNw YXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeeworICAgIGNhbGxPbk1haW5UaHJlYWQoXnsKICAgICAg ICAgaWYgKCFtX2NhbGxiYWNrKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBtX2NhbGxi YWNrLT5mbHVzaEN1ZXMoKTsKQEAgLTIwNzEsNyArMjA3MSw3IEBAIE5TQXJyYXkqIGl0ZW1LVk9Q cm9wZXJ0aWVzKCkKICAgICBpZiAoIW1fY2FsbGJhY2spCiAgICAgICAgIHJldHVybiBOTzsKIAot ICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CisgICAgY2Fs bE9uTWFpblRocmVhZCheewogICAgICAgICBpZiAoIW1fY2FsbGJhY2spIHsKICAgICAgICAgICAg IFtsb2FkaW5nUmVxdWVzdCBmaW5pc2hMb2FkaW5nV2l0aEVycm9yOm5pbF07CiAgICAgICAgICAg ICByZXR1cm47CkBAIC0yMDkwLDcgKzIwOTAsNyBAQCBOU0FycmF5KiBpdGVtS1ZPUHJvcGVydGll cygpCiAgICAgaWYgKCFtX2NhbGxiYWNrKQogICAgICAgICByZXR1cm4gTk87CiAKLSAgICBkaXNw YXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeeworICAgIGNhbGxPbk1haW5U aHJlYWQoXnsKICAgICAgICAgaWYgKCFtX2NhbGxiYWNrKSB7CiAgICAgICAgICAgICBbW2NoYWxs ZW5nZSBzZW5kZXJdIGNhbmNlbEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOmNoYWxsZW5nZV07CiAg ICAgICAgICAgICByZXR1cm47CkBAIC0yMTA5LDcgKzIxMDksNyBAQCBOU0FycmF5KiBpdGVtS1ZP UHJvcGVydGllcygpCiAgICAgaWYgKCFtX2NhbGxiYWNrKQogICAgICAgICByZXR1cm47CiAKLSAg ICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeeworICAgIGNhbGxP bk1haW5UaHJlYWQoXnsKICAgICAgICAgaWYgKG1fY2FsbGJhY2spCiAgICAgICAgICAgICBtX2Nh bGxiYWNrLT5kaWRDYW5jZWxMb2FkaW5nUmVxdWVzdChsb2FkaW5nUmVxdWVzdCk7CiAgICAgfSk7 Cg== 222352 2014-01-27 13:52:11 -0800 2014-01-27 14:01:51 -0800 Patch bug-127701-20140127135210.patch text/plain 6208 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJkNzMyOGMzNDg5YmU3 NGVmOWZhNzkwMGM4ZGY4ZWFiNGY3MDNhZS4uMGRlYThkN2UwYzY2OGFiMDczOTVjY2EwZmFjZWYz MGY1YjEzYmViZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTAxLTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFVzZSBjYWxsT25N YWluVGhyZWFkKCkgbm90IGRpc3BhdGNoX2FzeW5jKCkgaW4gTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI3NzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgLi4uKSB1c2Vk IHRvIGJlIGZpbmUgc28gbG9uZyBhcyB0aGUgbWFpbgorICAgICAgICB0aHJlYWQgd2FzIGFsc28g dGhlIHdlYiB0aHJlYWQuIEJ1dCBzaW5jZSB0aGF0J3Mgbm90IHRoZSBjYXNlIG9uIGlPUywgd2Ug c2hvdWxkIGJlCisgICAgICAgIHVzaW5nIGNhbGxPbk1haW5UaHJlYWQoKSBpbnN0ZWFkIChiZWNh dXNlIGl0IGRpc3BhdGNoZXMgdG8gdGhlIHdlYiB0aHJlYWQsIG5vdCBhcworICAgICAgICBpdHMg bmFtZSBpbXBsaWVzLCB0aGUgbWFpbiB0aHJlYWQpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akM6OnNlZWtUb1RpbWUpOgorICAgICAgICAoLVtXZWJDb3JlQVZGTW92aWVPYnNlcnZlciBsZWdp YmxlT3V0cHV0OmRpZE91dHB1dEF0dHJpYnV0ZWRTdHJpbmdzOm5hdGl2ZVNhbXBsZUJ1ZmZlcnM6 Zm9ySXRlbVRpbWU6XSk6CisgICAgICAgICgtW1dlYkNvcmVBVkZNb3ZpZU9ic2VydmVyIG91dHB1 dFNlcXVlbmNlV2FzRmx1c2hlZDpdKToKKyAgICAgICAgKC1bV2ViQ29yZUFWRkxvYWRlckRlbGVn YXRlIHJlc291cmNlTG9hZGVyOnNob3VsZFdhaXRGb3JMb2FkaW5nT2ZSZXF1ZXN0ZWRSZXNvdXJj ZTpdKToKKyAgICAgICAgKC1bV2ViQ29yZUFWRkxvYWRlckRlbGVnYXRlIHJlc291cmNlTG9hZGVy OnNob3VsZFdhaXRGb3JSZXNwb25zZVRvQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6XSk6CisgICAg ICAgICgtW1dlYkNvcmVBVkZMb2FkZXJEZWxlZ2F0ZSByZXNvdXJjZUxvYWRlcjpkaWRDYW5jZWxM b2FkaW5nUmVxdWVzdDpdKToKKwogMjAxNC0wMS0yNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KIAogICAgICAgICBSdW4gVXNlckFnZW50U2NyaXB0cyB0aHJvdWdoIGpzbWluIHJh dGhlciB0aGFuIHRoZSBjc3MgcHJlcHJvY2Vzc29yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRl eCAyNWY4NzI4ZDJmNDliZmYyODJhMmZjZDJkNjllMTc1YmU1Njk1NjRkLi43NWY3MzA1MmViNDcx YzhiYmQ1YzY1YzgzM2NhZmEwOWE1NGRkY2JiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAg LTQyNiw3ICs0MjYsOCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6 OmNyZWF0ZVZpZGVvTGF5ZXIoKQogICAgIGlmICghbV9hdlBsYXllciB8fCBtX3ZpZGVvTGF5ZXIp CiAgICAgICAgIHJldHVybjsKIAotICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXNdIHsKKyAgICBS ZWZQdHI8TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQz4gc3Ryb25nVGhpcyA9IHRo aXM7CisgICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywgc3Ryb25nVGhpc10gewogICAgICAgICBp ZiAoIW1fYXZQbGF5ZXIgfHwgbV92aWRlb0xheWVyKQogICAgICAgICAgICAgcmV0dXJuOwogCkBA IC02OTMsMTAgKzY5NCwxMCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akM6OnNlZWtUb1RpbWUoZG91YmxlIHRpbWUsIGRvdWJsZSBuZWdhdGl2ZQogICAgIENNVGltZSBj bUJlZm9yZSA9IENNVGltZU1ha2VXaXRoU2Vjb25kcyhuZWdhdGl2ZVRvbGVyYW5jZSwgNjAwKTsK ICAgICBDTVRpbWUgY21BZnRlciA9IENNVGltZU1ha2VXaXRoU2Vjb25kcyhwb3NpdGl2ZVRvbGVy YW5jZSwgNjAwKTsKIAotICAgIF9fYmxvY2sgYXV0byB3ZWFrVGhpcyA9IGNyZWF0ZVdlYWtQdHIo KTsKKyAgICBhdXRvIHdlYWtUaGlzID0gY3JlYXRlV2Vha1B0cigpOwogCiAgICAgW21fYXZQbGF5 ZXJJdGVtLmdldCgpIHNlZWtUb1RpbWU6Y21UaW1lIHRvbGVyYW5jZUJlZm9yZTpjbUJlZm9yZSB0 b2xlcmFuY2VBZnRlcjpjbUFmdGVyIGNvbXBsZXRpb25IYW5kbGVyOl4oQk9PTCBmaW5pc2hlZCkg ewotICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeewor ICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt3ZWFrVGhpcywgZmluaXNoZWRdIHsKICAgICAgICAg ICAgIGF1dG8gX3RoaXMgPSB3ZWFrVGhpcy5nZXQoKTsKICAgICAgICAgICAgIGlmICghX3RoaXMp CiAgICAgICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjAyOSwxMCArMjAzMCwxMiBAQCBOU0FycmF5 KiBpdGVtS1ZPUHJvcGVydGllcygpCiAgICAgaWYgKCFtX2NhbGxiYWNrKQogICAgICAgICByZXR1 cm47CiAKLSAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeewor ICAgIFJldGFpblB0cjxXZWJDb3JlQVZGTW92aWVPYnNlcnZlcj4gc3Ryb25nU2VsZiA9IHNlbGY7 CisgICAgUmV0YWluUHRyPE5TQXJyYXk+IHN0cm9uZ1N0cmluZ3MgPSBzdHJpbmdzOworICAgIGNh bGxPbk1haW5UaHJlYWQoW3N0cm9uZ1NlbGYsIHN0cm9uZ1N0cmluZ3MsIGl0ZW1UaW1lXSB7CiAg ICAgICAgIGlmICghbV9jYWxsYmFjaykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgbV9j YWxsYmFjay0+cHJvY2Vzc0N1ZShzdHJpbmdzLCBDTVRpbWVHZXRTZWNvbmRzKGl0ZW1UaW1lKSk7 CisgICAgICAgIG1fY2FsbGJhY2stPnByb2Nlc3NDdWUoc3Ryb25nU3RyaW5ncy5nZXQoKSwgQ01U aW1lR2V0U2Vjb25kcyhpdGVtVGltZSkpOwogICAgIH0pOwogfQogCkBAIC0yMDQzLDcgKzIwNDYs OCBAQCBOU0FycmF5KiBpdGVtS1ZPUHJvcGVydGllcygpCiAgICAgaWYgKCFtX2NhbGxiYWNrKQog ICAgICAgICByZXR1cm47CiAgICAgCi0gICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21h aW5fcXVldWUoKSwgXnsKKyAgICBSZXRhaW5QdHI8V2ViQ29yZUFWRk1vdmllT2JzZXJ2ZXI+IHN0 cm9uZ1NlbGYgPSBzZWxmOworICAgIGNhbGxPbk1haW5UaHJlYWQoW3N0cm9uZ1NlbGZdIHsKICAg ICAgICAgaWYgKCFtX2NhbGxiYWNrKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBtX2Nh bGxiYWNrLT5mbHVzaEN1ZXMoKTsKQEAgLTIwNzEsMTQgKzIwNzUsMTYgQEAgTlNBcnJheSogaXRl bUtWT1Byb3BlcnRpZXMoKQogICAgIGlmICghbV9jYWxsYmFjaykKICAgICAgICAgcmV0dXJuIE5P OwogCi0gICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKKyAg ICBSZXRhaW5QdHI8V2ViQ29yZUFWRkxvYWRlckRlbGVnYXRlPiBzdHJvbmdTZWxmID0gc2VsZjsK KyAgICBSZXRhaW5QdHI8QVZBc3NldFJlc291cmNlTG9hZGluZ1JlcXVlc3Q+IHN0cm9uZ1JlcXVl c3QgPSBsb2FkaW5nUmVxdWVzdDsKKyAgICBjYWxsT25NYWluVGhyZWFkKFtzdHJvbmdTZWxmLCBz dHJvbmdSZXF1ZXN0XSB7CiAgICAgICAgIGlmICghbV9jYWxsYmFjaykgewotICAgICAgICAgICAg W2xvYWRpbmdSZXF1ZXN0IGZpbmlzaExvYWRpbmdXaXRoRXJyb3I6bmlsXTsKKyAgICAgICAgICAg IFtzdHJvbmdSZXF1ZXN0IGZpbmlzaExvYWRpbmdXaXRoRXJyb3I6bmlsXTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIGlmICghbV9jYWxsYmFjay0+c2hvdWxkV2Fp dEZvckxvYWRpbmdPZlJlc291cmNlKGxvYWRpbmdSZXF1ZXN0KSkKLSAgICAgICAgICAgIFtsb2Fk aW5nUmVxdWVzdCBmaW5pc2hMb2FkaW5nV2l0aEVycm9yOm5pbF07CisgICAgICAgIGlmICghbV9j YWxsYmFjay0+c2hvdWxkV2FpdEZvckxvYWRpbmdPZlJlc291cmNlKHN0cm9uZ1JlcXVlc3QuZ2V0 KCkpKQorICAgICAgICAgICAgW3N0cm9uZ1JlcXVlc3QgZmluaXNoTG9hZGluZ1dpdGhFcnJvcjpu aWxdOwogICAgIH0pOwogCiAgICAgcmV0dXJuIFlFUzsKQEAgLTIwOTAsMTQgKzIwOTYsMTYgQEAg TlNBcnJheSogaXRlbUtWT1Byb3BlcnRpZXMoKQogICAgIGlmICghbV9jYWxsYmFjaykKICAgICAg ICAgcmV0dXJuIE5POwogCi0gICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVl dWUoKSwgXnsKKyAgICBSZXRhaW5QdHI8V2ViQ29yZUFWRkxvYWRlckRlbGVnYXRlPiBzdHJvbmdT ZWxmID0gc2VsZjsKKyAgICBSZXRhaW5QdHI8TlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZT4g c3Ryb25nQ2hhbGxlbmdlID0gY2hhbGxlbmdlOworICAgIGNhbGxPbk1haW5UaHJlYWQoW3N0cm9u Z1NlbGYsIHN0cm9uZ0NoYWxsZW5nZV0gewogICAgICAgICBpZiAoIW1fY2FsbGJhY2spIHsKLSAg ICAgICAgICAgIFtbY2hhbGxlbmdlIHNlbmRlcl0gY2FuY2VsQXV0aGVudGljYXRpb25DaGFsbGVu Z2U6Y2hhbGxlbmdlXTsKKyAgICAgICAgICAgIFtbc3Ryb25nQ2hhbGxlbmdlIHNlbmRlcl0gY2Fu Y2VsQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6c3Ryb25nQ2hhbGxlbmdlLmdldCgpXTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIGlmICghbV9jYWxsYmFjay0+c2hv dWxkV2FpdEZvclJlc3BvbnNlVG9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZShjaGFsbGVuZ2UpKQot ICAgICAgICAgICAgW1tjaGFsbGVuZ2Ugc2VuZGVyXSBjYW5jZWxBdXRoZW50aWNhdGlvbkNoYWxs ZW5nZTpjaGFsbGVuZ2VdOworICAgICAgICBpZiAoIW1fY2FsbGJhY2stPnNob3VsZFdhaXRGb3JS ZXNwb25zZVRvQXV0aGVudGljYXRpb25DaGFsbGVuZ2Uoc3Ryb25nQ2hhbGxlbmdlLmdldCgpKSkK KyAgICAgICAgICAgIFtbc3Ryb25nQ2hhbGxlbmdlIHNlbmRlcl0gY2FuY2VsQXV0aGVudGljYXRp b25DaGFsbGVuZ2U6c3Ryb25nQ2hhbGxlbmdlLmdldCgpXTsKICAgICB9KTsKIAogICAgIHJldHVy biBZRVM7CkBAIC0yMTA5LDkgKzIxMTcsMTEgQEAgTlNBcnJheSogaXRlbUtWT1Byb3BlcnRpZXMo KQogICAgIGlmICghbV9jYWxsYmFjaykKICAgICAgICAgcmV0dXJuOwogCi0gICAgZGlzcGF0Y2hf YXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKLSAgICAgICAgaWYgKG1fY2FsbGJh Y2spCi0gICAgICAgICAgICBtX2NhbGxiYWNrLT5kaWRDYW5jZWxMb2FkaW5nUmVxdWVzdChsb2Fk aW5nUmVxdWVzdCk7CisgICAgUmV0YWluUHRyPFdlYkNvcmVBVkZMb2FkZXJEZWxlZ2F0ZT4gc3Ry b25nU2VsZiA9IHNlbGY7CisgICAgUmV0YWluUHRyPEFWQXNzZXRSZXNvdXJjZUxvYWRpbmdSZXF1 ZXN0PiBzdHJvbmdSZXF1ZXN0ID0gbG9hZGluZ1JlcXVlc3Q7CisgICAgY2FsbE9uTWFpblRocmVh ZChbc3Ryb25nU2VsZiwgc3Ryb25nUmVxdWVzdF0geworICAgICAgICBpZiAoc3Ryb25nU2VsZi0+ bV9jYWxsYmFjaykKKyAgICAgICAgICAgIHN0cm9uZ1NlbGYtPm1fY2FsbGJhY2stPmRpZENhbmNl bExvYWRpbmdSZXF1ZXN0KHN0cm9uZ1JlcXVlc3QuZ2V0KCkpOwogICAgIH0pOwogfQogCg== 222355 2014-01-27 14:06:32 -0800 2014-01-27 15:46:45 -0800 Patch bug-127701-20140127140631.patch text/plain 8588 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyODQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJkNzMyOGMzNDg5YmU3 NGVmOWZhNzkwMGM4ZGY4ZWFiNGY3MDNhZS4uNWIzYmY5ODY0MDJjZjNkYjBjMzgzMmE3MzEwOWE5 ODY3MmY4MTBjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTAxLTI3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFVzZSBjYWxsT25N YWluVGhyZWFkKCkgbm90IGRpc3BhdGNoX2FzeW5jKCkgaW4gTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI3NzAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAg ICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIC4uLikgdXNlZCB0 byBiZSBmaW5lIHNvIGxvbmcgYXMgdGhlIG1haW4KKyAgICAgICAgdGhyZWFkIHdhcyBhbHNvIHRo ZSB3ZWIgdGhyZWFkLiBCdXQgc2luY2UgdGhhdCdzIG5vdCB0aGUgY2FzZSBvbiBpT1MsIHdlIHNo b3VsZCBiZQorICAgICAgICB1c2luZyBjYWxsT25NYWluVGhyZWFkKCkgaW5zdGVhZCAoYmVjYXVz ZSBpdCBkaXNwYXRjaGVzIHRvIHRoZSB3ZWIgdGhyZWFkLCBub3QgYXMKKyAgICAgICAgaXRzIG5h bWUgaW1wbGllcywgdGhlIG1haW4gdGhyZWFkKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMu aDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6 OmNyZWF0ZVdlYWtQdHIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvTGF5ZXIpOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6c2Vla1RvVGltZSk6CisgICAg ICAgICgtW1dlYkNvcmVBVkZNb3ZpZU9ic2VydmVyIGxlZ2libGVPdXRwdXQ6ZGlkT3V0cHV0QXR0 cmlidXRlZFN0cmluZ3M6bmF0aXZlU2FtcGxlQnVmZmVyczpmb3JJdGVtVGltZTpdKToKKyAgICAg ICAgKC1bV2ViQ29yZUFWRk1vdmllT2JzZXJ2ZXIgb3V0cHV0U2VxdWVuY2VXYXNGbHVzaGVkOl0p OgorICAgICAgICAoLVtXZWJDb3JlQVZGTG9hZGVyRGVsZWdhdGUgcmVzb3VyY2VMb2FkZXI6c2hv dWxkV2FpdEZvckxvYWRpbmdPZlJlcXVlc3RlZFJlc291cmNlOl0pOgorICAgICAgICAoLVtXZWJD b3JlQVZGTG9hZGVyRGVsZWdhdGUgcmVzb3VyY2VMb2FkZXI6c2hvdWxkV2FpdEZvclJlc3BvbnNl VG9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpdKToKKyAgICAgICAgKC1bV2ViQ29yZUFWRkxvYWRl ckRlbGVnYXRlIHJlc291cmNlTG9hZGVyOmRpZENhbmNlbExvYWRpbmdSZXF1ZXN0Ol0pOgorCiAy MDE0LTAxLTI0ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJ1 biBVc2VyQWdlbnRTY3JpcHRzIHRocm91Z2gganNtaW4gcmF0aGVyIHRoYW4gdGhlIGNzcyBwcmVw cm9jZXNzb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMuaAppbmRleCA2ZWQ5MThjMzY3ZGQyYWU2YzczN2Vi ODRkZDg5YzFlYTUzNzQ1ZDA4Li4xOGVkOWYyZGY4NWQxOGI0OTRjMjQ4MmEzMWEyMTU4NmMyZTlm ODc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5oCkBAIC0xMTYsNiArMTE2LDggQEAgcHVibGljOgog cHJpdmF0ZToKICAgICBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDKE1lZGlhUGxh eWVyKik7CiAKKyAgICBXZWFrUHRyPE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM+ IGNyZWF0ZVdlYWtQdHIoKSB7IHJldHVybiBtX3dlYWtQdHJGYWN0b3J5LmNyZWF0ZVdlYWtQdHIo KTsgfQorCiAgICAgLy8gZW5naW5lIHN1cHBvcnQKICAgICBzdGF0aWMgUGFzc093blB0cjxNZWRp YVBsYXllclByaXZhdGVJbnRlcmZhY2U+IGNyZWF0ZShNZWRpYVBsYXllciopOwogICAgIHN0YXRp YyB2b2lkIGdldFN1cHBvcnRlZFR5cGVzKEhhc2hTZXQ8U3RyaW5nPiYgdHlwZXMpOwpAQCAtMjE1 LDYgKzIxNyw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVWaWRlb1RyYWNrcygpOwogI2Vu ZGlmCiAKKyAgICBXZWFrUHRyRmFjdG9yeTxNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDPiBtX3dlYWtQdHJGYWN0b3J5OworCiAgICAgUmV0YWluUHRyPEFWVVJMQXNzZXQ+IG1fYXZB c3NldDsKICAgICBSZXRhaW5QdHI8QVZQbGF5ZXI+IG1fYXZQbGF5ZXI7CiAgICAgUmV0YWluUHRy PEFWUGxheWVySXRlbT4gbV9hdlBsYXllckl0ZW07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRl eCAyNWY4NzI4ZDJmNDliZmYyODJhMmZjZDJkNjllMTc1YmU1Njk1NjRkLi4zNGZhYmQ4YTFhMGYy OTE0NTNjOTBhMDI1MWJkYjcxZDc1YjkzODU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAg LTI3NCw2ICsyNzQsNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6 OnJlZ2lzdGVyTWVkaWFFbmdpbmUoTWVkaWFFbmdpbmVSZWdpc3RyYQogCiBNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpD KE1lZGlhUGxheWVyKiBwbGF5ZXIpCiAgICAgOiBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b24ocGxheWVyKQorICAgICwgbV93ZWFrUHRyRmFjdG9yeSh0aGlzKQogICAgICwgbV9vYmpjT2Jz ZXJ2ZXIoYWRvcHROUyhbW1dlYkNvcmVBVkZNb3ZpZU9ic2VydmVyIGFsbG9jXSBpbml0V2l0aENh bGxiYWNrOnRoaXNdKSkKICAgICAsIG1fdmlkZW9GcmFtZUhhc0RyYXduKGZhbHNlKQogICAgICwg bV9oYXZlQ2hlY2tlZFBsYXlhYmlsaXR5KGZhbHNlKQpAQCAtNDI2LDcgKzQyNywxMSBAQCB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvTGF5ZXIoKQog ICAgIGlmICghbV9hdlBsYXllciB8fCBtX3ZpZGVvTGF5ZXIpCiAgICAgICAgIHJldHVybjsKIAot ICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXNdIHsKKyAgICBhdXRvIHdlYWtUaGlzID0gY3JlYXRl V2Vha1B0cigpOworICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXMsIHdlYWtUaGlzXSB7CisgICAg ICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgaWYgKCFt X2F2UGxheWVyIHx8IG1fdmlkZW9MYXllcikKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtNjkz LDEwICs2OTgsMTAgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpz ZWVrVG9UaW1lKGRvdWJsZSB0aW1lLCBkb3VibGUgbmVnYXRpdmUKICAgICBDTVRpbWUgY21CZWZv cmUgPSBDTVRpbWVNYWtlV2l0aFNlY29uZHMobmVnYXRpdmVUb2xlcmFuY2UsIDYwMCk7CiAgICAg Q01UaW1lIGNtQWZ0ZXIgPSBDTVRpbWVNYWtlV2l0aFNlY29uZHMocG9zaXRpdmVUb2xlcmFuY2Us IDYwMCk7CiAKLSAgICBfX2Jsb2NrIGF1dG8gd2Vha1RoaXMgPSBjcmVhdGVXZWFrUHRyKCk7Cisg ICAgYXV0byB3ZWFrVGhpcyA9IGNyZWF0ZVdlYWtQdHIoKTsKIAogICAgIFttX2F2UGxheWVySXRl bS5nZXQoKSBzZWVrVG9UaW1lOmNtVGltZSB0b2xlcmFuY2VCZWZvcmU6Y21CZWZvcmUgdG9sZXJh bmNlQWZ0ZXI6Y21BZnRlciBjb21wbGV0aW9uSGFuZGxlcjpeKEJPT0wgZmluaXNoZWQpIHsKLSAg ICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKKyAgICAg ICAgY2FsbE9uTWFpblRocmVhZChbd2Vha1RoaXMsIGZpbmlzaGVkXSB7CiAgICAgICAgICAgICBh dXRvIF90aGlzID0gd2Vha1RoaXMuZ2V0KCk7CiAgICAgICAgICAgICBpZiAoIV90aGlzKQogICAg ICAgICAgICAgICAgIHJldHVybjsKQEAgLTIwMjksMTAgKzIwMzQsMTMgQEAgTlNBcnJheSogaXRl bUtWT1Byb3BlcnRpZXMoKQogICAgIGlmICghbV9jYWxsYmFjaykKICAgICAgICAgcmV0dXJuOwog Ci0gICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKLSAgICAg ICAgaWYgKCFtX2NhbGxiYWNrKQorICAgIFJldGFpblB0cjxXZWJDb3JlQVZGTW92aWVPYnNlcnZl cj4gc3Ryb25nU2VsZiA9IHNlbGY7CisgICAgUmV0YWluUHRyPE5TQXJyYXk+IHN0cm9uZ1N0cmlu Z3MgPSBzdHJpbmdzOworICAgIGNhbGxPbk1haW5UaHJlYWQoW3N0cm9uZ1NlbGYsIHN0cm9uZ1N0 cmluZ3MsIGl0ZW1UaW1lXSB7CisgICAgICAgIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakMqIGNhbGxiYWNrID0gc3Ryb25nU2VsZi0+bV9jYWxsYmFjazsKKyAgICAgICAgaWYgKCFj YWxsYmFjaykKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgbV9jYWxsYmFjay0+cHJvY2Vz c0N1ZShzdHJpbmdzLCBDTVRpbWVHZXRTZWNvbmRzKGl0ZW1UaW1lKSk7CisgICAgICAgIGNhbGxi YWNrLT5wcm9jZXNzQ3VlKHN0cm9uZ1N0cmluZ3MuZ2V0KCksIENNVGltZUdldFNlY29uZHMoaXRl bVRpbWUpKTsKICAgICB9KTsKIH0KIApAQCAtMjA0MywxMCArMjA1MSwxMCBAQCBOU0FycmF5KiBp dGVtS1ZPUHJvcGVydGllcygpCiAgICAgaWYgKCFtX2NhbGxiYWNrKQogICAgICAgICByZXR1cm47 CiAgICAgCi0gICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsK LSAgICAgICAgaWYgKCFtX2NhbGxiYWNrKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBt X2NhbGxiYWNrLT5mbHVzaEN1ZXMoKTsKKyAgICBSZXRhaW5QdHI8V2ViQ29yZUFWRk1vdmllT2Jz ZXJ2ZXI+IHN0cm9uZ1NlbGYgPSBzZWxmOworICAgIGNhbGxPbk1haW5UaHJlYWQoW3N0cm9uZ1Nl bGZdIHsKKyAgICAgICAgaWYgKE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMqIGNh bGxiYWNrID0gc3Ryb25nU2VsZi0+bV9jYWxsYmFjaykKKyAgICAgICAgICAgIGNhbGxiYWNrLT5m bHVzaEN1ZXMoKTsKICAgICB9KTsKIH0KICNlbmRpZgpAQCAtMjA3MSwxNCArMjA3OSwxNyBAQCBO U0FycmF5KiBpdGVtS1ZPUHJvcGVydGllcygpCiAgICAgaWYgKCFtX2NhbGxiYWNrKQogICAgICAg ICByZXR1cm4gTk87CiAKLSAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1 ZSgpLCBeewotICAgICAgICBpZiAoIW1fY2FsbGJhY2spIHsKLSAgICAgICAgICAgIFtsb2FkaW5n UmVxdWVzdCBmaW5pc2hMb2FkaW5nV2l0aEVycm9yOm5pbF07CisgICAgUmV0YWluUHRyPFdlYkNv cmVBVkZMb2FkZXJEZWxlZ2F0ZT4gc3Ryb25nU2VsZiA9IHNlbGY7CisgICAgUmV0YWluUHRyPEFW QXNzZXRSZXNvdXJjZUxvYWRpbmdSZXF1ZXN0PiBzdHJvbmdSZXF1ZXN0ID0gbG9hZGluZ1JlcXVl c3Q7CisgICAgY2FsbE9uTWFpblRocmVhZChbc3Ryb25nU2VsZiwgc3Ryb25nUmVxdWVzdF0gewor ICAgICAgICBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDKiBjYWxsYmFjayA9IHN0 cm9uZ1NlbGYtPm1fY2FsbGJhY2s7CisgICAgICAgIGlmICghY2FsbGJhY2spIHsKKyAgICAgICAg ICAgIFtzdHJvbmdSZXF1ZXN0IGZpbmlzaExvYWRpbmdXaXRoRXJyb3I6bmlsXTsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIGlmICghbV9jYWxsYmFjay0+c2hvdWxk V2FpdEZvckxvYWRpbmdPZlJlc291cmNlKGxvYWRpbmdSZXF1ZXN0KSkKLSAgICAgICAgICAgIFts b2FkaW5nUmVxdWVzdCBmaW5pc2hMb2FkaW5nV2l0aEVycm9yOm5pbF07CisgICAgICAgIGlmICgh Y2FsbGJhY2stPnNob3VsZFdhaXRGb3JMb2FkaW5nT2ZSZXNvdXJjZShzdHJvbmdSZXF1ZXN0Lmdl dCgpKSkKKyAgICAgICAgICAgIFtzdHJvbmdSZXF1ZXN0IGZpbmlzaExvYWRpbmdXaXRoRXJyb3I6 bmlsXTsKICAgICB9KTsKIAogICAgIHJldHVybiBZRVM7CkBAIC0yMDkwLDE0ICsyMTAxLDE3IEBA IE5TQXJyYXkqIGl0ZW1LVk9Qcm9wZXJ0aWVzKCkKICAgICBpZiAoIW1fY2FsbGJhY2spCiAgICAg ICAgIHJldHVybiBOTzsKIAotICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1 ZXVlKCksIF57Ci0gICAgICAgIGlmICghbV9jYWxsYmFjaykgewotICAgICAgICAgICAgW1tjaGFs bGVuZ2Ugc2VuZGVyXSBjYW5jZWxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpjaGFsbGVuZ2VdOwor ICAgIFJldGFpblB0cjxXZWJDb3JlQVZGTG9hZGVyRGVsZWdhdGU+IHN0cm9uZ1NlbGYgPSBzZWxm OworICAgIFJldGFpblB0cjxOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlPiBzdHJvbmdDaGFs bGVuZ2UgPSBjaGFsbGVuZ2U7CisgICAgY2FsbE9uTWFpblRocmVhZChbc3Ryb25nU2VsZiwgc3Ry b25nQ2hhbGxlbmdlXSB7CisgICAgICAgIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akMqIGNhbGxiYWNrID0gc3Ryb25nU2VsZi0+bV9jYWxsYmFjazsKKyAgICAgICAgaWYgKCFjYWxs YmFjaykgeworICAgICAgICAgICAgW1tzdHJvbmdDaGFsbGVuZ2Ugc2VuZGVyXSBjYW5jZWxBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZTpzdHJvbmdDaGFsbGVuZ2UuZ2V0KCldOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCFtX2NhbGxiYWNrLT5zaG91bGRXYWl0 Rm9yUmVzcG9uc2VUb0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKGNoYWxsZW5nZSkpCi0gICAgICAg ICAgICBbW2NoYWxsZW5nZSBzZW5kZXJdIGNhbmNlbEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOmNo YWxsZW5nZV07CisgICAgICAgIGlmICghY2FsbGJhY2stPnNob3VsZFdhaXRGb3JSZXNwb25zZVRv QXV0aGVudGljYXRpb25DaGFsbGVuZ2Uoc3Ryb25nQ2hhbGxlbmdlLmdldCgpKSkKKyAgICAgICAg ICAgIFtbc3Ryb25nQ2hhbGxlbmdlIHNlbmRlcl0gY2FuY2VsQXV0aGVudGljYXRpb25DaGFsbGVu Z2U6c3Ryb25nQ2hhbGxlbmdlLmdldCgpXTsKICAgICB9KTsKIAogICAgIHJldHVybiBZRVM7CkBA IC0yMTA5LDkgKzIxMjMsMTIgQEAgTlNBcnJheSogaXRlbUtWT1Byb3BlcnRpZXMoKQogICAgIGlm ICghbV9jYWxsYmFjaykKICAgICAgICAgcmV0dXJuOwogCi0gICAgZGlzcGF0Y2hfYXN5bmMoZGlz cGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKLSAgICAgICAgaWYgKG1fY2FsbGJhY2spCi0gICAg ICAgICAgICBtX2NhbGxiYWNrLT5kaWRDYW5jZWxMb2FkaW5nUmVxdWVzdChsb2FkaW5nUmVxdWVz dCk7CisgICAgUmV0YWluUHRyPFdlYkNvcmVBVkZMb2FkZXJEZWxlZ2F0ZT4gc3Ryb25nU2VsZiA9 IHNlbGY7CisgICAgUmV0YWluUHRyPEFWQXNzZXRSZXNvdXJjZUxvYWRpbmdSZXF1ZXN0PiBzdHJv bmdSZXF1ZXN0ID0gbG9hZGluZ1JlcXVlc3Q7CisgICAgY2FsbE9uTWFpblRocmVhZChbc3Ryb25n U2VsZiwgc3Ryb25nUmVxdWVzdF0geworICAgICAgICBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb25PYmpDKiBjYWxsYmFjayA9IHN0cm9uZ1NlbGYtPm1fY2FsbGJhY2s7CisgICAgICAgIGlm IChjYWxsYmFjaykKKyAgICAgICAgICAgIGNhbGxiYWNrLT5kaWRDYW5jZWxMb2FkaW5nUmVxdWVz dChzdHJvbmdSZXF1ZXN0LmdldCgpKTsKICAgICB9KTsKIH0KIAo=