135596 2014-08-04 23:23:16 -0700 [iOS] The raw bytes of an iWork document's PDF preview are displayed rather than the PDF itself 2014-08-05 10:50:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes ddkilzer oldest_to_newest 1026800 0 aestes 2014-08-04 23:23:16 -0700 [iOS] The raw bytes of an iWork document's PDF preview are displayed rather than the PDF itself 1026808 1 aestes 2014-08-04 23:41:16 -0700 <rdar://problem/17869353> 1026809 2 236014 aestes 2014-08-04 23:41:27 -0700 Created attachment 236014 Patch 1026810 3 236014 ddkilzer 2014-08-05 00:04:07 -0700 Comment on attachment 236014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236014&action=review r=me > Source/WebCore/platform/network/ios/QuickLook.mm:488 > + [delegate setQuickLookHandle:quickLookHandle.get()]; None of the other QuickLookHandle::create() overloaded methods need this? > Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp:128 > + if (!(m_quickLookHandle = QuickLookHandle::create(resourceLoader(), responseCopy.nsURLResponse()))) I think this would be easier to read as two lines: one where m_quickLookHandle is set, and one where its value is null-checked (as seen in removed code above). Either way is fine, though. 1026811 4 ddkilzer 2014-08-05 00:07:31 -0700 (In reply to comment #3) > (From update of attachment 236014 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=236014&action=review > > > Source/WebCore/platform/network/ios/QuickLook.mm:488 > > + [delegate setQuickLookHandle:quickLookHandle.get()]; > > None of the other QuickLookHandle::create() overloaded methods need this? This probably seems like a dumb question because it's the only method called by the code changes in the patch. I'm just curious why there are three different QuickLookHandle::create() methods in general, but that does not need an answer to land the fix. 1026814 5 aestes 2014-08-05 00:27:36 -0700 (In reply to comment #3) > (From update of attachment 236014 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=236014&action=review > > r=me Thanks! > > > Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp:128 > > + if (!(m_quickLookHandle = QuickLookHandle::create(resourceLoader(), responseCopy.nsURLResponse()))) > > I think this would be easier to read as two lines: one where m_quickLookHandle is set, and one where its value is null-checked (as seen in removed code above). > Either way is fine, though. I agree with you. I'll make this change. 1026820 6 aestes 2014-08-05 01:02:34 -0700 (In reply to comment #4) > (In reply to comment #3) > > (From update of attachment 236014 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=236014&action=review > > > > > Source/WebCore/platform/network/ios/QuickLook.mm:488 > > > + [delegate setQuickLookHandle:quickLookHandle.get()]; > > > > None of the other QuickLookHandle::create() overloaded methods need this? > > This probably seems like a dumb question because it's the only method called by the code changes in the patch. > > I'm just curious why there are three different QuickLookHandle::create() methods in general, but that does not need an answer to land the fix. Not a dumb question at all! The ways in which we create QuickLookHandles has unfortunately grown as we added support for different networking configurations. The original WebKit1 NSURLConnection code path, the USE(CFNETWORK) path, and the WebKit2 out-of-process networking path each have their own version of QuickLookHandle::create(). Since this bug doesn't occur in the WebKit1 configurations, I opted not to change their behavior, so that's why you only see changes in one of the three create() functions. 1026876 7 ddkilzer 2014-08-05 10:25:44 -0700 (In reply to comment #6) > (In reply to comment #4) > > (In reply to comment #3) > > > (From update of attachment 236014 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=236014&action=review > > > > > > > Source/WebCore/platform/network/ios/QuickLook.mm:488 > > > > + [delegate setQuickLookHandle:quickLookHandle.get()]; > > > > > > None of the other QuickLookHandle::create() overloaded methods need this? > > > > This probably seems like a dumb question because it's the only method called by the code changes in the patch. > > > > I'm just curious why there are three different QuickLookHandle::create() methods in general, but that does not need an answer to land the fix. > > Not a dumb question at all! The ways in which we create QuickLookHandles has unfortunately grown as we added support for different networking configurations. The original WebKit1 NSURLConnection code path, the USE(CFNETWORK) path, and the WebKit2 out-of-process networking path each have their own version of QuickLookHandle::create(). > > Since this bug doesn't occur in the WebKit1 configurations, I opted not to change their behavior, so that's why you only see changes in one of the three create() functions. It all makes sense now. (Not needed for this patch, but either some function renames or adding salient comments above each method would help to make this clearer when looking at the code in the future.) Thanks! 1026882 8 aestes 2014-08-05 10:50:11 -0700 Committed r172035: <http://trac.webkit.org/changeset/172035> 236014 2014-08-04 23:41:27 -0700 2014-08-05 00:04:07 -0700 Patch bug-135596-20140804234115.patch text/plain 8290 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTkxODc1YjU1ZTA1NzIy YmZkMGVkMTFiYzVhODM4ZWFkMWRmYTkwNC4uZGEyNmMyNjRkYjY0YjFkOTM5MDU3OTYyNTE3YjRh YTdmYTI3ZmJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTA4LTA0ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBUaGUgcmF3IGJ5dGVz IG9mIGFuIGlXb3JrIGRvY3VtZW50J3MgUERGIHByZXZpZXcgYXJlIGRpc3BsYXllZCByYXRoZXIg dGhhbiB0aGUgUERGIGl0c2VsZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM1NTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgU29tZSBpV29yayBkb2N1bWVudHMgY29udGFpbiBwcmUtcmVuZGVyZWQgUERG IHByZXZpZXdzLiBXaGVuIFdlYktpdCBhc2tzIFF1aWNrTG9vayB0byBjb252ZXJ0IHN1Y2ggYSBk b2N1bWVudCwKKyAgICAgICAgUXVpY2tMb29rIHdpbGwgcmV0dXJuIHRoaXMgUERGIGFzIHRoZSBj b252ZXJ0ZWQgcmVzcG9uc2UuIEhvd2V2ZXIsIHVudGlsIFdlYktpdCBoYXMgc2VudCB0aGUgZG9j dW1lbnQncyBkYXRhIHRvCisgICAgICAgIFF1aWNrTG9vaywgLVtRTFByZXZpZXdDb252ZXJ0ZXIg cHJldmlld1Jlc3BvbnNlXSB3aWxsIG1pc2xlYWRpbmdseSB0ZWxsIFdlYktpdCB0aGF0IHRoZSBj b252ZXJ0ZWQgcmVzb3VyY2Ugd2lsbAorICAgICAgICBiZSBvZiB0eXBlICd0ZXh0L2h0bWwnLiBU aGlzIGxlYWRzIFdlYktpdCB0byByZW5kZXIgdGhlIFBERiBwcmV2aWV3IGFzIEhUTUwuCisKKyAg ICAgICAgSW5zdGVhZCBvZiBxdWVyeWluZyBRTFByZXZpZXdDb252ZXJ0ZXIgZm9yIHRoZSBwcmV2 aWV3UmVzcG9uc2UgYmVmb3JlIHdlJ3ZlIHNlbnQgaXQgYW55IGRhdGEsIHBvc3Rwb25lIGNhbGxp bmcKKyAgICAgICAgUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZSB1bnRpbCB3ZSd2 ZSBiZWd1biB0byByZWNlaXZlIGRhdGEgdmlhIHRoZSBRTFByZXZpZXdDb252ZXJ0ZXIgZGVsZWdh dGUuIEF0CisgICAgICAgIHRoYXQgcG9pbnQgLVtRTFByZXZpZXdDb252ZXJ0ZXIgcHJldmlld1Jl c3BvbnNlXSB3aWxsIGhhdmUgdGhlIGNvcnJlY3QgTUlNRSB0eXBlIGFuZCB3ZSBjYW4gY2FsbCBk aWRSZWNlaXZlUmVzcG9uc2UuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBRdWlja0xvb2sgaXMg bm90IHRlc3RhYmxlIGZyb20gV2ViS2l0LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9p b3MvUXVpY2tMb29rLm1tOgorICAgICAgICAoLVtXZWJSZXNvdXJjZUxvYWRlclF1aWNrTG9va0Rl bGVnYXRlIGNvbm5lY3Rpb246ZGlkUmVjZWl2ZURhdGFBcnJheTpdKTogSWYgZGlkUmVjZWl2ZVJl c3BvbnNlIGhhcyB5ZXQgdG8gYmUKKyAgICAgICAgY2FsbGVkLCBjYWxsIGl0IG5vdyB3aXRoIFF1 aWNrTG9va0hhbmRsZTo6bnNSZXNwb25zZSgpLgorICAgICAgICAoLVtXZWJSZXNvdXJjZUxvYWRl clF1aWNrTG9va0RlbGVnYXRlIGNvbm5lY3Rpb246ZGlkUmVjZWl2ZURhdGE6bGVuZ3RoUmVjZWl2 ZWQ6XSk6IERpdHRvLgorICAgICAgICAoLVtXZWJSZXNvdXJjZUxvYWRlclF1aWNrTG9va0RlbGVn YXRlIGNvbm5lY3Rpb246ZGlkRmFpbFdpdGhFcnJvcjpdKTogRGl0dG8uCisgICAgICAgICgtW1dl YlJlc291cmNlTG9hZGVyUXVpY2tMb29rRGVsZWdhdGUgY29ubmVjdGlvbkRpZEZpbmlzaExvYWRp bmc6XSk6IEFzc2VydCB0aGF0IGRpZFJlY2VpdmVSZXNwb25zZSBoYXMgYmVlbiBjYWxsZWQuCisg ICAgICAgICgtW1dlYlJlc291cmNlTG9hZGVyUXVpY2tMb29rRGVsZWdhdGUgY2xlYXJIYW5kbGVd KTogQ2xlYXJlZCB0aGUgcmF3IHBvaW50ZXIgdG8gUXVpY2tMb29rSGFuZGxlLgorICAgICAgICAo V2ViQ29yZTo6UXVpY2tMb29rSGFuZGxlOjpjcmVhdGUpOiBQb2ludGVkIFdlYlJlc291cmNlTG9h ZGVyUXVpY2tMb29rRGVsZWdhdGUncyBxdWlja0xvb2tIYW5kbGUgcHJvcGVydHkgdG8KKyAgICAg ICAgdGhlIG5ld2x5IGNyZWF0ZWQgUXVpY2tMb29rSGFuZGxlLgorCiAyMDE0LTA4LTA0ICBDaHJp cyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IFNlbGVjdCBh Y3Rpdml0eSBiZWhhdmlvciBkb2VzIG5vdCB3b3JrIHdoZW4gYW4gZXhpc3RpbmcgcmFuZ2UgaXMg YWxyZWFkeSBzZWxlY3RlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGQyZTI4NDI4ZTI2MWI4NGViMTRiMTMzYTc1 MmVmNTkwN2E2OWUyMWIuLjg1YjMwODUyZjJkNzFlNjQxNjUzMzM1NmNhZWUzZDQ2MWY1M2Q3OWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNC0wOC0wNCAgQW5keSBFc3RlcyAgPGFl c3Rlc0BhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gVGhlIHJhdyBieXRlcyBvZiBhbiBpV29y ayBkb2N1bWVudCdzIFBERiBwcmV2aWV3IGFyZSBkaXNwbGF5ZWQgcmF0aGVyIHRoYW4gdGhlIFBE RiBpdHNlbGYKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzNTU5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZVdpdGhDZXJ0aWZpY2F0 ZUluZm8pOiBJZiB0aGUgcmVzcG9uc2Ugd2lsbCBiZSBoYW5kbGVkIGJ5CisgICAgICAgIFF1aWNr TG9vaywgZG8gbm90IGNhbGwgUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZS4gSXQg d2lsbCBiZSBjYWxsZWQgbGF0ZXIgYnkKKyAgICAgICAgV2ViUmVzb3VyY2VMb2FkZXJRdWlja0xv b2tEZWxlZ2F0ZSBvbmNlIGNvbnZlcnRlZCBkYXRhIGlzIHJlY2VpdmVkLgorCiAyMDE0LTA4LTA0 ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQg YSBmbGFnIGZvciB0aGUgQ1NTIFNlbGVjdG9ycyBsZXZlbCA0IGltcGxlbWVudGF0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2lvcy9RdWlja0xvb2subW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2lvcy9RdWlja0xvb2subW0KaW5kZXgg N2M0ZGMyMmUzMDM5YjU4OGFhMGRkMDkwODFhMTFiMGYyMjM4MjMyOS4uZDI2N2FlYTg4MTJhMGM2 ZThiOTQ4NWRiYzYxYTdkOGUyMGI3ZGQ1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9pb3MvUXVpY2tMb29rLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvaW9zL1F1aWNrTG9vay5tbQpAQCAtMzIzLDcgKzMyMyw5IEBAIEBlbmQKIAog QGludGVyZmFjZSBXZWJSZXNvdXJjZUxvYWRlclF1aWNrTG9va0RlbGVnYXRlIDogTlNPYmplY3Qg PE5TVVJMQ29ubmVjdGlvbkRlbGVnYXRlPiB7CiAgICAgUmVmUHRyPFJlc291cmNlTG9hZGVyPiBf cmVzb3VyY2VMb2FkZXI7CisgICAgQk9PTCBfaGFzU2VudERpZFJlY2VpdmVSZXNwb25zZTsKIH0K K0Bwcm9wZXJ0eSAobm9uYXRvbWljKSBRdWlja0xvb2tIYW5kbGUqIHF1aWNrTG9va0hhbmRsZTsK IEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdlYlJlc291cmNlTG9hZGVyUXVpY2tMb29rRGVsZWdh dGUKQEAgLTM0NCw2ICszNDYsMTIgQEAgLSAodm9pZCljb25uZWN0aW9uOihOU1VSTENvbm5lY3Rp b24gKiljb25uZWN0aW9uIGRpZFJlY2VpdmVEYXRhQXJyYXk6KE5TQXJyYXkgKikKICAgICBVTlVT RURfUEFSQU0oY29ubmVjdGlvbik7CiAgICAgaWYgKCFfcmVzb3VyY2VMb2FkZXIpCiAgICAgICAg IHJldHVybjsKKworICAgIGlmICghX2hhc1NlbnREaWRSZWNlaXZlUmVzcG9uc2UgJiYgX3F1aWNr TG9va0hhbmRsZSkgeworICAgICAgICBfaGFzU2VudERpZFJlY2VpdmVSZXNwb25zZSA9IFlFUzsK KyAgICAgICAgX3Jlc291cmNlTG9hZGVyLT5kaWRSZWNlaXZlUmVzcG9uc2UoX3F1aWNrTG9va0hh bmRsZS0+bnNSZXNwb25zZSgpKTsKKyAgICB9CisKICAgICBfcmVzb3VyY2VMb2FkZXItPmRpZFJl Y2VpdmVEYXRhQXJyYXkocmVpbnRlcnByZXRfY2FzdDxDRkFycmF5UmVmPihkYXRhQXJyYXkpKTsK IH0KICNlbmRpZgpAQCAtMzUzLDcgKzM2MSwxMiBAQCAtICh2b2lkKWNvbm5lY3Rpb246KE5TVVJM Q29ubmVjdGlvbiAqKWNvbm5lY3Rpb24gZGlkUmVjZWl2ZURhdGE6KE5TRGF0YSAqKWRhdGEgbAog ICAgIFVOVVNFRF9QQVJBTShjb25uZWN0aW9uKTsKICAgICBpZiAoIV9yZXNvdXJjZUxvYWRlcikK ICAgICAgICAgcmV0dXJuOwotICAgIAorCisgICAgaWYgKCFfaGFzU2VudERpZFJlY2VpdmVSZXNw b25zZSAmJiBfcXVpY2tMb29rSGFuZGxlKSB7CisgICAgICAgIF9oYXNTZW50RGlkUmVjZWl2ZVJl c3BvbnNlID0gWUVTOworICAgICAgICBfcmVzb3VyY2VMb2FkZXItPmRpZFJlY2VpdmVSZXNwb25z ZShfcXVpY2tMb29rSGFuZGxlLT5uc1Jlc3BvbnNlKCkpOworICAgIH0KKwogICAgIC8vIFF1aWNr TG9vayBjb2RlIHNlbmRzIHVzIGEgbmlsIGRhdGEgYXQgdGltZXMuIFRoZSBjaGVjayBiZWxvdyBp cyB0aGUgc2FtZSBhcyB0aGUgb25lIGluCiAgICAgLy8gUmVzb3VyY2VIYW5kbGVNYWMuY3BwIGFk ZGVkIGZvciBhIGRpZmZlcmVudCBidWcuCiAgICAgaWYgKCFbZGF0YSBsZW5ndGhdKQpAQCAtMzY2 LDIwICszNzksMjcgQEAgLSAodm9pZCljb25uZWN0aW9uRGlkRmluaXNoTG9hZGluZzooTlNVUkxD b25uZWN0aW9uICopY29ubmVjdGlvbgogICAgIFVOVVNFRF9QQVJBTShjb25uZWN0aW9uKTsKICAg ICBpZiAoIV9yZXNvdXJjZUxvYWRlcikKICAgICAgICAgcmV0dXJuOwotICAgIAorCisgICAgQVNT RVJUKF9oYXNTZW50RGlkUmVjZWl2ZVJlc3BvbnNlKTsKICAgICBfcmVzb3VyY2VMb2FkZXItPmRp ZEZpbmlzaExvYWRpbmcoMCk7CiB9CiAKIC0gKHZvaWQpY29ubmVjdGlvbjooTlNVUkxDb25uZWN0 aW9uICopY29ubmVjdGlvbiBkaWRGYWlsV2l0aEVycm9yOihOU0Vycm9yICopZXJyb3IKIHsKICAg ICBVTlVTRURfUEFSQU0oY29ubmVjdGlvbik7Ci0gICAgCisKKyAgICBpZiAoIV9oYXNTZW50RGlk UmVjZWl2ZVJlc3BvbnNlICYmIF9xdWlja0xvb2tIYW5kbGUpIHsKKyAgICAgICAgX2hhc1NlbnRE aWRSZWNlaXZlUmVzcG9uc2UgPSBZRVM7CisgICAgICAgIF9yZXNvdXJjZUxvYWRlci0+ZGlkUmVj ZWl2ZVJlc3BvbnNlKF9xdWlja0xvb2tIYW5kbGUtPm5zUmVzcG9uc2UoKSk7CisgICAgfQorCiAg ICAgX3Jlc291cmNlTG9hZGVyLT5kaWRGYWlsKFJlc291cmNlRXJyb3IoZXJyb3IpKTsKIH0KIAog LSAodm9pZCljbGVhckhhbmRsZQogewogICAgIF9yZXNvdXJjZUxvYWRlciA9IG51bGxwdHI7Cisg ICAgX3F1aWNrTG9va0hhbmRsZSA9IG51bGxwdHI7CiB9CiAKIEBlbmQKQEAgLTQ2NSw2ICs0ODUs NyBAQCBzdGQ6OnVuaXF1ZV9wdHI8UXVpY2tMb29rSGFuZGxlPiBRdWlja0xvb2tIYW5kbGU6OmNy ZWF0ZShSZXNvdXJjZUxvYWRlciogbG9hZGVyLAogCiAgICAgUmV0YWluUHRyPFdlYlJlc291cmNl TG9hZGVyUXVpY2tMb29rRGVsZWdhdGU+IGRlbGVnYXRlID0gYWRvcHROUyhbW1dlYlJlc291cmNl TG9hZGVyUXVpY2tMb29rRGVsZWdhdGUgYWxsb2NdIGluaXRXaXRoUmVzb3VyY2VMb2FkZXI6bG9h ZGVyXSk7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFF1aWNrTG9va0hhbmRsZT4gcXVpY2tMb29rSGFu ZGxlKG5ldyBRdWlja0xvb2tIYW5kbGUoW2xvYWRlci0+b3JpZ2luYWxSZXF1ZXN0KCkubnNVUkxS ZXF1ZXN0KERvTm90VXBkYXRlSFRUUEJvZHkpIFVSTF0sIG5pbCwgcmVzcG9uc2UsIGRlbGVnYXRl LmdldCgpKSk7CisgICAgW2RlbGVnYXRlIHNldFF1aWNrTG9va0hhbmRsZTpxdWlja0xvb2tIYW5k bGUuZ2V0KCldOwogICAgIGxvYWRlci0+ZGlkQ3JlYXRlUXVpY2tMb29rSGFuZGxlKCpxdWlja0xv b2tIYW5kbGUpOwogICAgIHJldHVybiBXVEY6Om1vdmUocXVpY2tMb29rSGFuZGxlKTsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxv YWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvV2ViUmVzb3VyY2VM b2FkZXIuY3BwCmluZGV4IDE3OWM3ZmRhMWVmODFlODU5YTE0ZTM2ODQ5NDJhZmE0ODNkYzc0NTIu LjQxM2IxNmM3NjhkZTA1YjFjMGJlOThmZjE3MmQyNjU3ZjlkNTAxNTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJSZXNvdXJjZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYlJlc291cmNlTG9hZGVyLmNw cApAQCAtMTEwLDEyICsxMTAsNiBAQCB2b2lkIFdlYlJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZl UmVzcG9uc2VXaXRoQ2VydGlmaWNhdGVJbmZvKGNvbnN0IFJlc291cmNlUmVzcAogCiAgICAgUmVz b3VyY2VSZXNwb25zZSByZXNwb25zZUNvcHkocmVzcG9uc2UpOwogCi0jaWYgVVNFKFFVSUNLX0xP T0spCi0gICAgbV9xdWlja0xvb2tIYW5kbGUgPSBRdWlja0xvb2tIYW5kbGU6OmNyZWF0ZShyZXNv dXJjZUxvYWRlcigpLCByZXNwb25zZS5uc1VSTFJlc3BvbnNlKCkpOwotICAgIGlmIChtX3F1aWNr TG9va0hhbmRsZSkKLSAgICAgICAgcmVzcG9uc2VDb3B5ID0gUmVzb3VyY2VSZXNwb25zZShtX3F1 aWNrTG9va0hhbmRsZS0+bnNSZXNwb25zZSgpKTsKLSNlbmRpZgotCiAgICAgLy8gRklYTUU6IFRo aXMgc2hvdWxkIHVzZSBDZXJ0aWZpY2F0ZUluZm8gdG8gYXZvaWQgdGhlIHBsYXRmb3JtIGlmZGVm cy4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ3MjQuCiAj aWYgUExBVEZPUk0oQ09DT0EpCiAgICAgcmVzcG9uc2VDb3B5LnNldENlcnRpZmljYXRlQ2hhaW4o Y2VydGlmaWNhdGVJbmZvLmNlcnRpZmljYXRlQ2hhaW4oKSk7CkBAIC0xMjMsOSArMTE3LDE3IEBA IHZvaWQgV2ViUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZVdpdGhDZXJ0aWZpY2F0 ZUluZm8oY29uc3QgUmVzb3VyY2VSZXNwCiAgICAgcmVzcG9uc2VDb3B5LnNldFNvdXBNZXNzYWdl Q2VydGlmaWNhdGUoY2VydGlmaWNhdGVJbmZvLmNlcnRpZmljYXRlKCkpOwogICAgIHJlc3BvbnNl Q29weS5zZXRTb3VwTWVzc2FnZVRMU0Vycm9ycyhjZXJ0aWZpY2F0ZUluZm8udGxzRXJyb3JzKCkp OwogI2VuZGlmCisKICAgICBpZiAobV9jb3JlTG9hZGVyLT5kb2N1bWVudExvYWRlcigpLT5hcHBs aWNhdGlvbkNhY2hlSG9zdCgpLT5tYXliZUxvYWRGYWxsYmFja0ZvclJlc3BvbnNlKG1fY29yZUxv YWRlci5nZXQoKSwgcmVzcG9uc2VDb3B5KSkKICAgICAgICAgcmV0dXJuOwotICAgIG1fY29yZUxv YWRlci0+ZGlkUmVjZWl2ZVJlc3BvbnNlKHJlc3BvbnNlQ29weSk7CisKKyNpZiBVU0UoUVVJQ0tf TE9PSykKKyAgICAvLyBSZWZyYWluIGZyb20gY2FsbGluZyBkaWRSZWNlaXZlUmVzcG9uc2UgaWYg UXVpY2tMb29rIHdpbGwgY29udmVydCB0aGlzIHJlc3BvbnNlLCBzaW5jZSB0aGUgTUlNRSB0eXBl IG9mIHRoZQorICAgIC8vIGNvbnZlcnRlZCByZXNvdXJjZSBpc24ndCB5ZXQga25vd24uIFdlYlJl c291cmNlTG9hZGVyUXVpY2tMb29rRGVsZWdhdGUgd2lsbCBsYXRlciBjYWxsIGRpZFJlY2VpdmVS ZXNwb25zZSB1cG9uCisgICAgLy8gcmVjZWl2aW5nIHRoZSBjb252ZXJ0ZWQgZGF0YS4KKyAgICBp ZiAoIShtX3F1aWNrTG9va0hhbmRsZSA9IFF1aWNrTG9va0hhbmRsZTo6Y3JlYXRlKHJlc291cmNl TG9hZGVyKCksIHJlc3BvbnNlQ29weS5uc1VSTFJlc3BvbnNlKCkpKSkKKyNlbmRpZgorICAgICAg ICBtX2NvcmVMb2FkZXItPmRpZFJlY2VpdmVSZXNwb25zZShyZXNwb25zZUNvcHkpOwogCiAgICAg Ly8gSWYgbV9jb3JlTG9hZGVyIGJlY29tZXMgbnVsbCBhcyBhIHJlc3VsdCBvZiB0aGUgZGlkUmVj ZWl2ZVJlc3BvbnNlIGNhbGxiYWNrLCB3ZSBjYW4ndCB1c2UgdGhlIHNlbmQgZnVuY3Rpb24oKS4g CiAgICAgaWYgKCFtX2NvcmVMb2FkZXIpCg==