132637 2014-05-06 19:07:59 -0700 [Mac, iOS] Add source application accounting to AVURLAsset. 2014-05-08 18:07:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble calvaris commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim philipj sergio oldest_to_newest 1007172 0 jer.noble 2014-05-06 19:07:59 -0700 [Mac, iOS] Add source application accounting to AVURLAsset. 1007707 1 231088 jer.noble 2014-05-08 12:06:58 -0700 Created attachment 231088 Patch 1007717 2 231088 eric.carlson 2014-05-08 12:24:24 -0700 Comment on attachment 231088 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231088&action=review > Source/WebCore/ChangeLog:8 > + Property account for the application responisble for data loading by passing the source Nit: Do you mean "Properly"? > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:154 > +SOFT_LINK_POINTER(AVFoundation, AVURLAssetClientBundleIdentifierKey, NSString *) Should you use SOFT_LINK_POINTER_OPTIONAL for older systems? 1007808 3 jer.noble 2014-05-08 16:37:18 -0700 (In reply to comment #2) > (From update of attachment 231088 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=231088&action=review > > > Source/WebCore/ChangeLog:8 > > + Property account for the application responisble for data loading by passing the source > > Nit: Do you mean "Properly"? I do! Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:154 > > +SOFT_LINK_POINTER(AVFoundation, AVURLAssetClientBundleIdentifierKey, NSString *) > > Should you use SOFT_LINK_POINTER_OPTIONAL for older systems? Good catch. I'll do this and check that it's non-null before adding it to the options dictionary. I'll upload a new patch to address the other platform build errors. 1007815 4 231111 jer.noble 2014-05-08 16:40:11 -0700 Created attachment 231111 Patch for landing. 1007847 5 jer.noble 2014-05-08 18:07:26 -0700 Committed r168512: <http://trac.webkit.org/changeset/168512> 231088 2014-05-08 12:06:58 -0700 2014-05-08 12:24:24 -0700 Patch bug-132637-20140508120635.patch text/plain 15242 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU2YmIyN2UwN2NiMGRj YWRhODNlOGUzNWQ0MDQ4ZTA0ODY2ZDg4Ni4uMmY5ZTk4YzhkNmYwZDYyOWIxYjU0YWIzMmZmYmVm YTQ1Y2ZhNTJlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA1LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gQWRkIHNv dXJjZSBhcHBsaWNhdGlvbiBhY2NvdW50aW5nIHRvIEFWVVJMQXNzZXQuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI2MzcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQcm9wZXJ0eSBhY2NvdW50IGZvciB0 aGUgYXBwbGljYXRpb24gcmVzcG9uaXNibGUgZm9yIGRhdGEgbG9hZGluZyBieSBwYXNzaW5nIHRo ZSBzb3VyY2UKKyAgICAgICAgYXBwbGljYXRpb24gaWRlbnRpZmllciB0aHJvdWdoIHRvIEFWRm91 bmRhdGlvbiB0aHJvdWdoIEFWVVJMQXNzZXQgb3B0aW9ucy4KKworICAgICAgICAqIGh0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50Ojpw YXJzZUF0dHJpYnV0ZSk6CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50Lmg6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TWVkaWFQbGF5ZXI6OnNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmllcik6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyQ2xpZW50OjptZWRpYVBsYXllclNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmllcik6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZUFWQXNzZXRGb3JVUkwpOgorICAgICAgICAq IHBsYXRmb3JtL25ldHdvcmsvTmV0d29ya2luZ0NvbnRleHQuaDoKKwogMjAxNC0wNC0yOSAgSmVy IE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBSZW1vdmUgd29y a2Fyb3VuZCBmb3IgPHJkYXI6Ly9wcm9ibGVtLzE2NTc4NzI3Pi4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRl eCA4NjUwZjJjM2ZiOTgxZWFjMDBhMjA3ZWE5ZTA4ZGZjZGQ0YmJhZTE0Li4wYTAzMDQ4NjM5MTA0 MmI4OTFjYjkxOGJkZTNjNTMxMWI1ODcwZmNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTYgQEAKKzIwMTQtMDUtMDYgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAg ICAgICAgW01hYywgaU9TXSBBZGQgc291cmNlIGFwcGxpY2F0aW9uIGFjY291bnRpbmcgdG8gQVZV UkxBc3NldC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEzMjYzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZCBhY2Nlc3NvciBmb3Igc291cmNlQXBwbGljYXRpb25JZGVudGlmaWVyLgorCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5oOgorICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW06CisgICAgICAgIChX ZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Ojpzb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIpOgor CiAyMDE0LTA1LTA2ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAg ICBEb24ndCBzZWxlY3QgYW4gaW1hZ2UgdGhhdCBpcyBhYm91dCB0byBoYXZlIGl0cyBtZW51IHNo b3duLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCmluZGV4IDIzMGUyYjdlNDU3M2M4ZTZmZWU2NWI4YTU4ZjFhMDM1NGMwNTFl ZTkuLjZkODYzNWMxMjFkYWM1ODIwNDk5YzViOWEzZTNiMThlOTc5MDFmMmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxOSBAQAorMjAxNC0wNS0wNiAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxl LmNvbT4KKworICAgICAgICBbTWFjLCBpT1NdIEFkZCBzb3VyY2UgYXBwbGljYXRpb24gYWNjb3Vu dGluZyB0byBBVlVSTEFzc2V0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTMyNjM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIGFjY2Vzc29yIGZvciBzb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIu CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5oOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL21hYy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5tbToK KyAgICAgICAgKFdlYktpdDo6UmVtb3RlTmV0d29ya2luZ0NvbnRleHQ6OnNvdXJjZUFwcGxpY2F0 aW9uSWRlbnRpZmllcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMv V2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvbWFjL1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW06CisgICAgICAgIChXZWJL aXQ6OldlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQ6OnNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmll cik6CisKIDIwMTQtMDUtMDYgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW2lPU11bV0syXSBBZGQgdGFwIGhpZ2hsaWdodCBvbiB0aGUgc2ltcGxlIFVJ VGFwR2VzdHVyZVJlY29nbml6ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQu Y3BwCmluZGV4IGNjZjJlY2NjM2Y0ODhjMTU3YmFjNDJkOTYzMTg3MDZiOTNjYjIwNWYuLmJlNTNj OTAzMjNkNTk3NTQzODZjN2JkYzhjOWRkMTVlYmJiOWQxN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNjIsNiArNjIsNyBAQAogI2luY2x1ZGUgIk1lZGlh TGlzdC5oIgogI2luY2x1ZGUgIk1lZGlhUXVlcnlFdmFsdWF0b3IuaCIKICNpbmNsdWRlICJNZWRp YVNlc3Npb25NYW5hZ2VyLmgiCisjaW5jbHVkZSAiTmV0d29ya2luZ0NvbnRleHQuaCIKICNpbmNs dWRlICJQYWdlQWN0aXZpdHlBc3NlcnRpb25Ub2tlbi5oIgogI2luY2x1ZGUgIlBhZ2VHcm91cC5o IgogI2luY2x1ZGUgIlBhZ2VUaHJvdHRsZXIuaCIKQEAgLTU2MjYsNiArNTYyNywxNSBAQCBib29s IEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyU2hvdWxkV2FpdEZvclJlc3BvbnNlVG9BdXRo ZW50aWNhdGlvbkNoYWxsZW5nZQogICAgIHJldHVybiB0cnVlOwogfQogCitTdHJpbmcgSFRNTE1l ZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJTb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIoKSBjb25z dAoreworICAgIGlmIChGcmFtZSogZnJhbWUgPSBkb2N1bWVudCgpLmZyYW1lKCkpIHsKKyAgICAg ICAgaWYgKE5ldHdvcmtpbmdDb250ZXh0KiBuZXR3b3JraW5nQ29udGV4dCA9IGZyYW1lLT5sb2Fk ZXIoKS5uZXR3b3JraW5nQ29udGV4dCgpKQorICAgICAgICAgICAgcmV0dXJuIG5ldHdvcmtpbmdD b250ZXh0LT5zb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIoKTsKKyAgICB9CisgICAgcmV0dXJu IGVtcHR5U3RyaW5nKCk7Cit9CisKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cmVtb3ZlQmVoYXZp b3JzUmVzdHJpY3Rpb25zQWZ0ZXJGaXJzdFVzZXJHZXN0dXJlKCkKIHsKICAgICBtX21lZGlhU2Vz c2lvbi0+cmVtb3ZlQmVoYXZpb3JSZXN0cmljdGlvbihIVE1MTWVkaWFTZXNzaW9uOjpSZXF1aXJl VXNlckdlc3R1cmVGb3JMb2FkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TE1lZGlhRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgK aW5kZXggNGQ0NGQ5NWM5YmQ2ZmI0MTY4N2FjMDYwYTMyNzU4NzQxN2Y3M2VmNi4uZjUxYzBmMWZl ZDJkOTA2ODRjZDA3Y2I1ODU2YTdlNjA2NWE0YmZkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M TWVkaWFFbGVtZW50LmgKQEAgLTU2Niw2ICs1NjYsNyBAQCBwcml2YXRlOgogCiAgICAgdmlydHVh bCBib29sIG1lZGlhUGxheWVyU2hvdWxkV2FpdEZvclJlc3BvbnNlVG9BdXRoZW50aWNhdGlvbkNo YWxsZW5nZShjb25zdCBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpIG92ZXJyaWRlOwogICAgIHZp cnR1YWwgdm9pZCBtZWRpYVBsYXllckhhbmRsZVBsYXliYWNrQ29tbWFuZChNZWRpYVNlc3Npb246 OlJlbW90ZUNvbnRyb2xDb21tYW5kVHlwZSBjb21tYW5kKSBvdmVycmlkZSB7IGRpZFJlY2VpdmVS ZW1vdGVDb250cm9sQ29tbWFuZChjb21tYW5kKTsgfQorICAgIHZpcnR1YWwgU3RyaW5nIG1lZGlh UGxheWVyU291cmNlQXBwbGljYXRpb25JZGVudGlmaWVyKCkgY29uc3Q7CiAKICAgICB2b2lkIGxv YWRUaW1lckZpcmVkKFRpbWVyPEhUTUxNZWRpYUVsZW1lbnQ+Jik7CiAgICAgdm9pZCBwcm9ncmVz c0V2ZW50VGltZXJGaXJlZChUaW1lcjxIVE1MTWVkaWFFbGVtZW50PiYpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCmluZGV4IGExMGUzOTI4 YTlkMTc4ODQ2NWY5M2M1NTdhNzJiMzc4ZmI4NzUzYjAuLmE1M2E4ZjkwMWI0YTE5NjM5YWIzNTZm ZTZlMjU1MjdiYTBhZmY0YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL01lZGlhUGxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9NZWRpYVBsYXllci5jcHAKQEAgLTEzODksNiArMTM4OSwxNCBAQCB2b2lkIE1lZGlhUGxh eWVyOjpoYW5kbGVQbGF5YmFja0NvbW1hbmQoTWVkaWFTZXNzaW9uOjpSZW1vdGVDb250cm9sQ29t bWFuZFR5cGUgYwogICAgIG1fbWVkaWFQbGF5ZXJDbGllbnQtPm1lZGlhUGxheWVySGFuZGxlUGxh eWJhY2tDb21tYW5kKGNvbW1hbmQpOwogfQogCitTdHJpbmcgTWVkaWFQbGF5ZXI6OnNvdXJjZUFw cGxpY2F0aW9uSWRlbnRpZmllcigpIGNvbnN0Cit7CisgICAgaWYgKCFtX21lZGlhUGxheWVyQ2xp ZW50KQorICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKworICAgIHJldHVybiBtX21lZGlh UGxheWVyQ2xpZW50LT5tZWRpYVBsYXllclNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmllcigpOwor fQorCiB2b2lkIE1lZGlhUGxheWVyRmFjdG9yeVN1cHBvcnQ6OmNhbGxSZWdpc3Rlck1lZGlhRW5n aW5lKE1lZGlhRW5naW5lUmVnaXN0ZXIgcmVnaXN0ZXJNZWRpYUVuZ2luZSkKIHsKICAgICByZWdp c3Rlck1lZGlhRW5naW5lKGFkZE1lZGlhRW5naW5lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCmluZGV4IDIwYTkxMGFiYjJkZDA3NDk5NmVhNmVk YzQ5Zjg1M2RhMmMxNDU0ZDUuLjlhNjVkMGM5ODA5YTdjNDVlZjcwMjVkMDgwODA5ZjliMTI0NWU4 NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxh eWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIu aApAQCAtMjY0LDYgKzI2NCw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBtZWRpYVBs YXllclNob3VsZFdhaXRGb3JSZXNwb25zZVRvQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoY29uc3Qg QXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwg dm9pZCBtZWRpYVBsYXllckhhbmRsZVBsYXliYWNrQ29tbWFuZChNZWRpYVNlc3Npb246OlJlbW90 ZUNvbnRyb2xDb21tYW5kVHlwZSkgeyB9CisKKyAgICB2aXJ0dWFsIFN0cmluZyBtZWRpYVBsYXll clNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIGVtcHR5U3RyaW5n KCk7IH0KIH07CiAKIGNsYXNzIE1lZGlhUGxheWVyU3VwcG9ydHNUeXBlQ2xpZW50IHsKQEAgLTU3 NSw2ICs1NzcsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIHNob3VsZFdhaXRGb3JSZXNwb25zZVRv QXV0aGVudGljYXRpb25DaGFsbGVuZ2UoY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKTsK ICAgICB2b2lkIGhhbmRsZVBsYXliYWNrQ29tbWFuZChNZWRpYVNlc3Npb246OlJlbW90ZUNvbnRy b2xDb21tYW5kVHlwZSk7CisgICAgU3RyaW5nIHNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmllcigp IGNvbnN0OwogCiBwcml2YXRlOgogICAgIE1lZGlhUGxheWVyKE1lZGlhUGxheWVyQ2xpZW50Kik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2 YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCA3ZTNlOWZiOTA4YzJmNDMwZGYwYjU4MjA3OWE3 ZmY1Yjk3YWVjNjZiLi4wMjk2YjFhN2FjODk1MWZkM2QzZjkzMWExZDRlMzQ5ZGQ1OGJjMjM5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAgLTE1MSw2ICsxNTEsNyBAQCBTT0ZUX0xJTktfUE9J TlRFUihBVkZvdW5kYXRpb24sIEFWTWVkaWFUeXBlQXVkaW8sIE5TU3RyaW5nICopCiBTT0ZUX0xJ TktfUE9JTlRFUihBVkZvdW5kYXRpb24sIEFWTWVkaWFUeXBlTWV0YWRhdGEsIE5TU3RyaW5nICop CiBTT0ZUX0xJTktfUE9JTlRFUihBVkZvdW5kYXRpb24sIEFWUGxheWVySXRlbURpZFBsYXlUb0Vu ZFRpbWVOb3RpZmljYXRpb24sIE5TU3RyaW5nICopCiBTT0ZUX0xJTktfUE9JTlRFUihBVkZvdW5k YXRpb24sIEFWVVJMQXNzZXRJbmhlcml0VVJJUXVlcnlDb21wb25lbnRGcm9tUmVmZXJlbmNpbmdV UklLZXksIE5TU3RyaW5nICopCitTT0ZUX0xJTktfUE9JTlRFUihBVkZvdW5kYXRpb24sIEFWVVJM QXNzZXRDbGllbnRCdW5kbGVJZGVudGlmaWVyS2V5LCBOU1N0cmluZyAqKQogU09GVF9MSU5LX1BP SU5URVIoQVZGb3VuZGF0aW9uLCBBVkFzc2V0SW1hZ2VHZW5lcmF0b3JBcGVydHVyZU1vZGVDbGVh bkFwZXJ0dXJlLCBOU1N0cmluZyAqKQogU09GVF9MSU5LX1BPSU5URVIoQVZGb3VuZGF0aW9uLCBB VlVSTEFzc2V0UmVmZXJlbmNlUmVzdHJpY3Rpb25zS2V5LCBOU1N0cmluZyAqKQogU09GVF9MSU5L X1BPSU5URVIoQVZGb3VuZGF0aW9uLCBBVkxheWVyVmlkZW9HcmF2aXR5UmVzaXplQXNwZWN0LCBO U1N0cmluZyAqKQpAQCAtMTc1LDYgKzE3Niw3IEBAIFNPRlRfTElOS19DT05TVEFOVChDb3JlTWVk aWEsIGtDTVRpbWVaZXJvLCBDTVRpbWUpCiAjZGVmaW5lIEFWTWVkaWFUeXBlTWV0YWRhdGEgZ2V0 QVZNZWRpYVR5cGVNZXRhZGF0YSgpCiAjZGVmaW5lIEFWUGxheWVySXRlbURpZFBsYXlUb0VuZFRp bWVOb3RpZmljYXRpb24gZ2V0QVZQbGF5ZXJJdGVtRGlkUGxheVRvRW5kVGltZU5vdGlmaWNhdGlv bigpCiAjZGVmaW5lIEFWVVJMQXNzZXRJbmhlcml0VVJJUXVlcnlDb21wb25lbnRGcm9tUmVmZXJl bmNpbmdVUklLZXkgZ2V0QVZVUkxBc3NldEluaGVyaXRVUklRdWVyeUNvbXBvbmVudEZyb21SZWZl cmVuY2luZ1VSSUtleSgpCisjZGVmaW5lIEFWVVJMQXNzZXRDbGllbnRCdW5kbGVJZGVudGlmaWVy S2V5IGdldEFWVVJMQXNzZXRDbGllbnRCdW5kbGVJZGVudGlmaWVyS2V5KCkKICNkZWZpbmUgQVZB c3NldEltYWdlR2VuZXJhdG9yQXBlcnR1cmVNb2RlQ2xlYW5BcGVydHVyZSBnZXRBVkFzc2V0SW1h Z2VHZW5lcmF0b3JBcGVydHVyZU1vZGVDbGVhbkFwZXJ0dXJlKCkKICNkZWZpbmUgQVZVUkxBc3Nl dFJlZmVyZW5jZVJlc3RyaWN0aW9uc0tleSBnZXRBVlVSTEFzc2V0UmVmZXJlbmNlUmVzdHJpY3Rp b25zS2V5KCkKICNkZWZpbmUgQVZMYXllclZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdCBnZXRBVkxh eWVyVmlkZW9HcmF2aXR5UmVzaXplQXNwZWN0KCkKQEAgLTY2MCw2ICs2NjIsMTAgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVBVkFzc2V0Rm9yVVJMKGNv bnN0IFN0cmluZyYgdXJsKQogICAgIGlmIChwbGF5ZXIoKS0+ZG9lc0hhdmVBdHRyaWJ1dGUoIngt aXR1bmVzLWluaGVyaXQtdXJpLXF1ZXJ5LWNvbXBvbmVudCIpKQogICAgICAgICBbb3B0aW9ucy5n ZXQoKSBzZXRPYmplY3Q6IFtOU051bWJlciBudW1iZXJXaXRoQm9vbDogVFJVRV0gZm9yS2V5OiBB VlVSTEFzc2V0SW5oZXJpdFVSSVF1ZXJ5Q29tcG9uZW50RnJvbVJlZmVyZW5jaW5nVVJJS2V5XTsK IAorICAgIFN0cmluZyBpZGVudGlmaWVyID0gcGxheWVyKCktPnNvdXJjZUFwcGxpY2F0aW9uSWRl bnRpZmllcigpOworICAgIGlmICghaWRlbnRpZmllci5pc0VtcHR5KCkpCisgICAgICAgIFtvcHRp b25zIHNldE9iamVjdDppZGVudGlmaWVyIGZvcktleTpBVlVSTEFzc2V0Q2xpZW50QnVuZGxlSWRl bnRpZmllcktleV07CisKICNpZiBFTkFCTEUoQVZGX0NBUFRJT05TKQogICAgIGNvbnN0IFZlY3Rv cjxSZWZQdHI8UGxhdGZvcm1UZXh0VHJhY2s+PiYgb3V0T2ZCYW5kVHJhY2tTb3VyY2VzID0gcGxh eWVyKCktPm91dE9mQmFuZFRyYWNrU291cmNlcygpOwogICAgIGlmICghb3V0T2ZCYW5kVHJhY2tT b3VyY2VzLmlzRW1wdHkoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9OZXR3b3JraW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9OZXR3b3JraW5nQ29udGV4dC5oCmluZGV4IGZjZmZjMDRlYTEzNjc4MmYzOWU2NzY5YmE0 ODM0YmFjZGYwN2QwNjAuLjZjNjc1ZDU0MTQyM2Q0MWU0NmNkMDI1OWM1NWY2NjBiMWVhNGEwNGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya2luZ0Nv bnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtpbmdD b250ZXh0LmgKQEAgLTU0LDYgKzU0LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBsb2Nh bEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVkKCkgY29uc3QgPSAwOyAvLyBGSVhNRTogUmVjb25j aWxlIHdpdGggUmVzb3VyY2VIYW5kbGU6OmZvcmNlQ29udGVudFNuaWZmaW5nKCkuCiAgICAgdmly dHVhbCBTY2hlZHVsZVBhaXJIYXNoU2V0KiBzY2hlZHVsZWRSdW5Mb29wUGFpcnMoKSBjb25zdCB7 IHJldHVybiAwOyB9CiAgICAgdmlydHVhbCBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBzb3VyY2VBcHBs aWNhdGlvbkF1ZGl0RGF0YSgpIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIFN0cmluZyBzb3VyY2VB cHBsaWNhdGlvbklkZW50aWZpZXIoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBSZXNvdXJjZUVy cm9yIGJsb2NrZWRFcnJvcihjb25zdCBSZXNvdXJjZVJlcXVlc3QmKSBjb25zdCA9IDA7CiAjZW5k aWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVOZXR3b3JraW5nQ29udGV4dC5oIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5oCmluZGV4IGViMjBjZmRhNWVlZTIzNTc4NTI0OTFm ZmMzMzQxN2JlOTkyOWJkYjcuLjgyMjZjOGU1YjQ5MmI1YjU4ZjViMzhlOTEwY2MzYWFmMmQzZDhk OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TmV0d29ya2luZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0LmgKQEAgLTU1LDYgKzU1LDcgQEAgcHJpdmF0ZToK ICAgICB2aXJ0dWFsIGJvb2wgbG9jYWxGaWxlQ29udGVudFNuaWZmaW5nRW5hYmxlZCgpIGNvbnN0 IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgU2NoZWR1bGVQYWlySGFzaFNldCogc2NoZWR1bGVkUnVu TG9vcFBhaXJzKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBSZXRhaW5QdHI8Q0ZEYXRh UmVmPiBzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSgpIGNvbnN0IG92ZXJyaWRlOworICAgIHZp cnR1YWwgU3RyaW5nIHNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmllcigpIGNvbnN0IG92ZXJyaWRl OwogICAgIHZpcnR1YWwgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciBibG9ja2VkRXJyb3IoY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBX ZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHN0b3JhZ2VTZXNzaW9uKCkgY29uc3Qgb3Zl cnJpZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3Vw cG9ydC9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tCmluZGV4IDFiMTVlYWIyMzMwNDNiNTg2 ZTA2MjljYzU0MjI0N2YzYzE1MzYwOTQuLjg5NjA2N2E1NDExZDBhNDk5MzkxYzU2M2U0OTVlZDJk NGFmZWM4NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbQpAQCAtMTA0LDYgKzEwNCwxMSBA QCBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBXZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Ojpzb3VyY2VB cHBsaWNhdGlvbkF1ZGl0RGF0YSgpIGNvbgogICAgIHJldHVybiByZWludGVycHJldF9jYXN0PENG RGF0YVJlZj4od2Vidmlldy5fc291cmNlQXBwbGljYXRpb25BdWRpdERhdGEpOwogfQogCitTdHJp bmcgV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dDo6c291cmNlQXBwbGljYXRpb25JZGVudGlmaWVy KCkgY29uc3QKK3sKKyAgICByZXR1cm4gW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5kbGVJZGVu dGlmaWVyXTsKK30KKwogUmVzb3VyY2VFcnJvciBXZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Ojpi bG9ja2VkRXJyb3IoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KSBjb25zdAogewogICAg IHJldHVybiBmcmFtZSgpLT5sb2FkZXIoKS5jbGllbnQoKS5ibG9ja2VkRXJyb3IocmVxdWVzdCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9SZW1vdGVOZXR3b3Jr aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvUmVtb3RlTmV0d29y a2luZ0NvbnRleHQuaAppbmRleCBmNWNjY2MxZDEzMWM0MzY1ZGE5ZTM3NjY1YjkzN2Q3NDIxMGRj OWQ0Li4xZmEzMmUyNmM4ZjkyMmQ4MzViMGM5ZWMyMmFlNzIwMWQ5NWIyMTI5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL1JlbW90ZU5ldHdvcmtpbmdDb250 ZXh0LmgKQEAgLTY0LDYgKzY0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldExvY2FsRmlsZUNv bnRlbnRTbmlmZmluZ0VuYWJsZWQoYm9vbCB2YWx1ZSkgeyBtX2xvY2FsRmlsZUNvbnRlbnRTbmlm ZmluZ0VuYWJsZWQgPSB2YWx1ZTsgfQogICAgIHZpcnR1YWwgYm9vbCBsb2NhbEZpbGVDb250ZW50 U25pZmZpbmdFbmFibGVkKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBSZXRhaW5QdHI8 Q0ZEYXRhUmVmPiBzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSgpIGNvbnN0IG92ZXJyaWRlOwor ICAgIHZpcnR1YWwgU3RyaW5nIHNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmllcigpIGNvbnN0IG92 ZXJyaWRlOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciBibG9ja2VkRXJyb3Io Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JikgY29uc3Qgb3ZlcnJpZGU7CiAjZW5kaWYK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL1JlbW90ZU5l dHdvcmtpbmdDb250ZXh0Lm1tIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvbWFjL1Jl bW90ZU5ldHdvcmtpbmdDb250ZXh0Lm1tCmluZGV4IDViOWViMzg4Y2QzYjIzZmU2YmEyMWM5ZGQ3 NjZiM2JkMDZkZjYxYTYuLmIzMjFlZmJiOGE4ZDIxZjI4MDZkYWIwMDNjNmZiNzUzYjc5OWU1NTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL21hYy9SZW1vdGVOZXR3 b3JraW5nQ29udGV4dC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9tYWMv UmVtb3RlTmV0d29ya2luZ0NvbnRleHQubW0KQEAgLTgwLDYgKzgwLDExIEBAIFJldGFpblB0cjxD RkRhdGFSZWY+IFJlbW90ZU5ldHdvcmtpbmdDb250ZXh0Ojpzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0 RGF0YSgpIGNvbnN0CiAjZW5kaWYKIH0KIAorU3RyaW5nIFJlbW90ZU5ldHdvcmtpbmdDb250ZXh0 Ojpzb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIoKSBjb25zdAoreworICAgIHJldHVybiBTZXNz aW9uVHJhY2tlcjo6Z2V0SWRlbnRpZmllckJhc2UoKTsKK30KKwogUmVzb3VyY2VFcnJvciBSZW1v dGVOZXR3b3JraW5nQ29udGV4dDo6YmxvY2tlZEVycm9yKGNvbnN0IFJlc291cmNlUmVxdWVzdCYg cmVxdWVzdCkgY29uc3QKIHsKICAgICByZXR1cm4gV2ViS2l0OjpibG9ja2VkRXJyb3IocmVxdWVz dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L21hYy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0LmgKaW5kZXgg ZGVmMjAzODdmYzI4ODhkODk3YWM0Yzk2YmE0Y2FlZDdmNDZiNzM1ZC4uZmRlNmQ3ODRjNmNhZDEy NjI2OTExYzMyNGVmODQ4ZDQ1NDkyM2QwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkZyYW1l TmV0d29ya2luZ0NvbnRleHQuaApAQCAtNTcsNiArNTcsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1 YWwgYm9vbCBsb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVkKCkgY29uc3Qgb3ZlcnJpZGU7 CiAgICAgdmlydHVhbCBTY2hlZHVsZVBhaXJIYXNoU2V0KiBzY2hlZHVsZWRSdW5Mb29wUGFpcnMo KSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFJldGFpblB0cjxDRkRhdGFSZWY+IHNvdXJj ZUFwcGxpY2F0aW9uQXVkaXREYXRhKCkgY29uc3Qgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBTdHJp bmcgc291cmNlQXBwbGljYXRpb25JZGVudGlmaWVyKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmly dHVhbCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIGJsb2NrZWRFcnJvcihjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6Ok5l dHdvcmtTdG9yYWdlU2Vzc2lvbiYgc3RvcmFnZVNlc3Npb24oKSBjb25zdCBvdmVycmlkZTsKIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21h Yy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbQppbmRleCBi YmM5MmQ5YzNkNDE4ZDkxY2U4ZThiOTZiMmJiNjBkZTE3ZThiMGYzLi41ZWRiNDI1MTYwZTQ0ZGZl NGE0OTcyMDZlM2VmOTM1M2NlNjFiMTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYkZyYW1l TmV0d29ya2luZ0NvbnRleHQubW0KQEAgLTEwMSw2ICsxMDEsMTEgQEAgUmV0YWluUHRyPENGRGF0 YVJlZj4gV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dDo6c291cmNlQXBwbGljYXRpb25BdWRpdERh dGEoKSBjb24KICNlbmRpZgogfQogCitTdHJpbmcgV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dDo6 c291cmNlQXBwbGljYXRpb25JZGVudGlmaWVyKCkgY29uc3QKK3sKKyAgICByZXR1cm4gU2Vzc2lv blRyYWNrZXI6OmdldElkZW50aWZpZXJCYXNlKCk7Cit9CisKIFJlc291cmNlRXJyb3IgV2ViRnJh bWVOZXR3b3JraW5nQ29udGV4dDo6YmxvY2tlZEVycm9yKGNvbnN0IFJlc291cmNlUmVxdWVzdCYg cmVxdWVzdCkgY29uc3QKIHsKICAgICByZXR1cm4gZnJhbWUoKS0+bG9hZGVyKCkuY2xpZW50KCku YmxvY2tlZEVycm9yKHJlcXVlc3QpOwo= 231111 2014-05-08 16:40:11 -0700 2014-05-08 16:40:11 -0700 Patch for landing. bug-132637-20140508163948.patch text/plain 14975 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTE4YTFmYTI4NjIwMmZh ZDU1NDQ0NTRjZmMwZmY1Y2I3NDNjZjA0NS4uMzJkNjAxMGE0ZGFmYjNmZWFlM2Q4ODBiZjlhMjYw NWViYWI2MzNiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTA1LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gQWRkIHNv dXJjZSBhcHBsaWNhdGlvbiBhY2NvdW50aW5nIHRvIEFWVVJMQXNzZXQuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI2MzcKKworICAgICAgICBSZXZp ZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgUHJvcGVybHkgYWNjb3VudCBmb3IgdGhl IGFwcGxpY2F0aW9uIHJlc3BvbmlzYmxlIGZvciBkYXRhIGxvYWRpbmcgYnkgcGFzc2luZyB0aGUg c291cmNlCisgICAgICAgIGFwcGxpY2F0aW9uIGlkZW50aWZpZXIgdGhyb3VnaCB0byBBVkZvdW5k YXRpb24gdGhyb3VnaCBBVlVSTEFzc2V0IG9wdGlvbnMuCisKKyAgICAgICAgKiBodG1sL0hUTUxN ZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cGFy c2VBdHRyaWJ1dGUpOgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5oOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyOjpzb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBs YXllckNsaWVudDo6bWVkaWFQbGF5ZXJTb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJp dmF0ZUFWRm91bmRhdGlvbk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVBVkFzc2V0Rm9yVVJMKToKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtpbmdDb250ZXh0Lmg6CisKIDIwMTQtMDUtMDggIE15bGVz IEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAgICBodHRwL3Rlc3Rz L3NlY3VyaXR5L3hzcy1ERU5JRUQteHNsLWRvY3VtZW50LXJlZGlyZWN0LnhtbCBmYWlscyB3aXRo IE5ldHdvcmtQcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZTdjODU3M2M1NGVhMjhjNWU4OWNj OTkwNGQ3MGUyZDAyMzllODllMC4uYzMwODUwYjgyMzhmMzE2YzFhMjA4MzgzNjY4NjBlMTk0NGNh YjNmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE0LTA1LTA2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gQWRkIHNv dXJjZSBhcHBsaWNhdGlvbiBhY2NvdW50aW5nIHRvIEFWVVJMQXNzZXQuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzI2MzcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYWNjZXNzb3IgZm9yIHNvdXJj ZUFwcGxpY2F0aW9uSWRlbnRpZmllci4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkZy YW1lTmV0d29ya2luZ0NvbnRleHQuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZU5ldHdvcmtpbmdDb250ZXh0Lm1tOgorICAgICAgICAoV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4 dDo6c291cmNlQXBwbGljYXRpb25JZGVudGlmaWVyKToKKwogMjAxNC0wNS0wOCAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBhIGRpZmZlcmVudCBp bnN0YWxsIG5hbWUgZm9yIFdlYktpdExlZ2FjeS5mcmFtZXdvcmsgZm9yIHN0YWdlZCBmcmFtZXdv cmsgYnVpbGRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNDViOGZlZDA4M2FkNmE0NGFiMWI0OWYyNTYyYWYyMDVm ZWE0NDA4YS4uMWZlZWZkNWFiMDE2NDhkNzU2NDA4OGE4N2RlMmUxODRmYmQyZTA1NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE0LTA1LTA2ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVA YXBwbGUuY29tPgorCisgICAgICAgIFtNYWMsIGlPU10gQWRkIHNvdXJjZSBhcHBsaWNhdGlvbiBh Y2NvdW50aW5nIHRvIEFWVVJMQXNzZXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzI2MzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgYWNjZXNzb3IgZm9yIHNvdXJjZUFwcGxpY2F0aW9uSWRlbnRp Zmllci4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0 Lmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvbWFjL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0 Lm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6c291cmNlQXBw bGljYXRpb25JZGVudGlmaWVyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L21hYy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbToKKyAgICAgICAg KFdlYktpdDo6V2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dDo6c291cmNlQXBwbGljYXRpb25JZGVu dGlmaWVyKToKKwogMjAxNC0wNS0wOCAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTiAocjE2ODA1Myk6IFBob25lIG51bWJlciBkZXRlY3Rpb24gYm94 ZXMgYXJlIHdyb25nIHdoZW4gc2Nyb2xsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVs ZW1lbnQuY3BwCmluZGV4IDc1OGM0N2MyZDlkNWY3N2UwMGVmZWIwZTdmZjUyM2Y2MjUwMWJhMjgu LmIxOTQ2MzgzZGQyYzM3MDhkOWFlZTVhYTliMTE1N2FjYTViNDA5YzUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtNjIsNiArNjIsNyBAQAogI2luY2x1ZGUg Ik1lZGlhTGlzdC5oIgogI2luY2x1ZGUgIk1lZGlhUXVlcnlFdmFsdWF0b3IuaCIKICNpbmNsdWRl ICJNZWRpYVNlc3Npb25NYW5hZ2VyLmgiCisjaW5jbHVkZSAiTmV0d29ya2luZ0NvbnRleHQuaCIK ICNpbmNsdWRlICJQYWdlQWN0aXZpdHlBc3NlcnRpb25Ub2tlbi5oIgogI2luY2x1ZGUgIlBhZ2VH cm91cC5oIgogI2luY2x1ZGUgIlBhZ2VUaHJvdHRsZXIuaCIKQEAgLTU2MjgsNiArNTYyOSwxNSBA QCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6Om1lZGlhUGxheWVyU2hvdWxkV2FpdEZvclJlc3BvbnNl VG9BdXRoZW50aWNhdGlvbkNoYWxsZW5nZQogICAgIHJldHVybiB0cnVlOwogfQogCitTdHJpbmcg SFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJTb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIo KSBjb25zdAoreworICAgIGlmIChGcmFtZSogZnJhbWUgPSBkb2N1bWVudCgpLmZyYW1lKCkpIHsK KyAgICAgICAgaWYgKE5ldHdvcmtpbmdDb250ZXh0KiBuZXR3b3JraW5nQ29udGV4dCA9IGZyYW1l LT5sb2FkZXIoKS5uZXR3b3JraW5nQ29udGV4dCgpKQorICAgICAgICAgICAgcmV0dXJuIG5ldHdv cmtpbmdDb250ZXh0LT5zb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIoKTsKKyAgICB9CisgICAg cmV0dXJuIGVtcHR5U3RyaW5nKCk7Cit9CisKIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6cmVtb3Zl QmVoYXZpb3JzUmVzdHJpY3Rpb25zQWZ0ZXJGaXJzdFVzZXJHZXN0dXJlKCkKIHsKICAgICBtX21l ZGlhU2Vzc2lvbi0+cmVtb3ZlQmVoYXZpb3JSZXN0cmljdGlvbihIVE1MTWVkaWFTZXNzaW9uOjpS ZXF1aXJlVXNlckdlc3R1cmVGb3JMb2FkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTE1lZGlhRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmgKaW5kZXggNGQ0NGQ5NWM5YmQ2ZmI0MTY4N2FjMDYwYTMyNzU4NzQxN2Y3M2VmNi4uZjUx YzBmMWZlZDJkOTA2ODRjZDA3Y2I1ODU2YTdlNjA2NWE0YmZkZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmgKQEAgLTU2Niw2ICs1NjYsNyBAQCBwcml2YXRlOgogCiAgICAg dmlydHVhbCBib29sIG1lZGlhUGxheWVyU2hvdWxkV2FpdEZvclJlc3BvbnNlVG9BdXRoZW50aWNh dGlvbkNoYWxsZW5nZShjb25zdCBBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpIG92ZXJyaWRlOwog ICAgIHZpcnR1YWwgdm9pZCBtZWRpYVBsYXllckhhbmRsZVBsYXliYWNrQ29tbWFuZChNZWRpYVNl c3Npb246OlJlbW90ZUNvbnRyb2xDb21tYW5kVHlwZSBjb21tYW5kKSBvdmVycmlkZSB7IGRpZFJl Y2VpdmVSZW1vdGVDb250cm9sQ29tbWFuZChjb21tYW5kKTsgfQorICAgIHZpcnR1YWwgU3RyaW5n IG1lZGlhUGxheWVyU291cmNlQXBwbGljYXRpb25JZGVudGlmaWVyKCkgY29uc3Q7CiAKICAgICB2 b2lkIGxvYWRUaW1lckZpcmVkKFRpbWVyPEhUTUxNZWRpYUVsZW1lbnQ+Jik7CiAgICAgdm9pZCBw cm9ncmVzc0V2ZW50VGltZXJGaXJlZChUaW1lcjxIVE1MTWVkaWFFbGVtZW50PiYpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCmluZGV4IGEx MGUzOTI4YTlkMTc4ODQ2NWY5M2M1NTdhNzJiMzc4ZmI4NzUzYjAuLmE1M2E4ZjkwMWI0YTE5NjM5 YWIzNTZmZTZlMjU1MjdiYTBhZmY0YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKQEAgLTEzODksNiArMTM4OSwxNCBAQCB2b2lkIE1l ZGlhUGxheWVyOjpoYW5kbGVQbGF5YmFja0NvbW1hbmQoTWVkaWFTZXNzaW9uOjpSZW1vdGVDb250 cm9sQ29tbWFuZFR5cGUgYwogICAgIG1fbWVkaWFQbGF5ZXJDbGllbnQtPm1lZGlhUGxheWVySGFu ZGxlUGxheWJhY2tDb21tYW5kKGNvbW1hbmQpOwogfQogCitTdHJpbmcgTWVkaWFQbGF5ZXI6OnNv dXJjZUFwcGxpY2F0aW9uSWRlbnRpZmllcigpIGNvbnN0Cit7CisgICAgaWYgKCFtX21lZGlhUGxh eWVyQ2xpZW50KQorICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKworICAgIHJldHVybiBt X21lZGlhUGxheWVyQ2xpZW50LT5tZWRpYVBsYXllclNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmll cigpOworfQorCiB2b2lkIE1lZGlhUGxheWVyRmFjdG9yeVN1cHBvcnQ6OmNhbGxSZWdpc3Rlck1l ZGlhRW5naW5lKE1lZGlhRW5naW5lUmVnaXN0ZXIgcmVnaXN0ZXJNZWRpYUVuZ2luZSkKIHsKICAg ICByZWdpc3Rlck1lZGlhRW5naW5lKGFkZE1lZGlhRW5naW5lKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCmluZGV4IDIwYTkxMGFiYjJkZDA3NDk5 NmVhNmVkYzQ5Zjg1M2RhMmMxNDU0ZDUuLjlhNjVkMGM5ODA5YTdjNDVlZjcwMjVkMDgwODA5Zjli MTI0NWU4NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01l ZGlhUGxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQ bGF5ZXIuaApAQCAtMjY0LDYgKzI2NCw4IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBt ZWRpYVBsYXllclNob3VsZFdhaXRGb3JSZXNwb25zZVRvQXV0aGVudGljYXRpb25DaGFsbGVuZ2Uo Y29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKSB7IHJldHVybiBmYWxzZTsgfQogICAgIHZp cnR1YWwgdm9pZCBtZWRpYVBsYXllckhhbmRsZVBsYXliYWNrQ29tbWFuZChNZWRpYVNlc3Npb246 OlJlbW90ZUNvbnRyb2xDb21tYW5kVHlwZSkgeyB9CisKKyAgICB2aXJ0dWFsIFN0cmluZyBtZWRp YVBsYXllclNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIGVtcHR5 U3RyaW5nKCk7IH0KIH07CiAKIGNsYXNzIE1lZGlhUGxheWVyU3VwcG9ydHNUeXBlQ2xpZW50IHsK QEAgLTU3NSw2ICs1NzcsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIHNob3VsZFdhaXRGb3JSZXNw b25zZVRvQXV0aGVudGljYXRpb25DaGFsbGVuZ2UoY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVu Z2UmKTsKICAgICB2b2lkIGhhbmRsZVBsYXliYWNrQ29tbWFuZChNZWRpYVNlc3Npb246OlJlbW90 ZUNvbnRyb2xDb21tYW5kVHlwZSk7CisgICAgU3RyaW5nIHNvdXJjZUFwcGxpY2F0aW9uSWRlbnRp ZmllcigpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIE1lZGlhUGxheWVyKE1lZGlhUGxheWVyQ2xp ZW50Kik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCA3ZTNlOWZiOTA4YzJmNDMwZGYwYjU4 MjA3OWE3ZmY1Yjk3YWVjNjZiLi41OGMzY2ExYmQzMTRlYTQ0NjMzZmQ4ZmQwMTM4MDA5ZTk4MGQw ZGFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAgLTE1OCw2ICsxNTgsOCBAQCBTT0ZUX0xJ TktfUE9JTlRFUihBVkZvdW5kYXRpb24sIEFWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3RG aWxsLCBOU1N0cmluZyAqKQogU09GVF9MSU5LX1BPSU5URVIoQVZGb3VuZGF0aW9uLCBBVkxheWVy VmlkZW9HcmF2aXR5UmVzaXplLCBOU1N0cmluZyAqKQogU09GVF9MSU5LX1BPSU5URVIoQ29yZVZp ZGVvLCBrQ1ZQaXhlbEJ1ZmZlclBpeGVsRm9ybWF0VHlwZUtleSwgTlNTdHJpbmcgKikKIAorU09G VF9MSU5LX1BPSU5URVJfT1BUSU9OQUwoQVZGb3VuZGF0aW9uLCBBVlVSTEFzc2V0Q2xpZW50QnVu ZGxlSWRlbnRpZmllcktleSwgTlNTdHJpbmcgKikKKwogU09GVF9MSU5LX0NPTlNUQU5UKENvcmVN ZWRpYSwga0NNVGltZVplcm8sIENNVGltZSkKIAogI2RlZmluZSBBVlBsYXllciBnZXRBVlBsYXll ckNsYXNzKCkKQEAgLTE3NSw2ICsxNzcsNyBAQCBTT0ZUX0xJTktfQ09OU1RBTlQoQ29yZU1lZGlh LCBrQ01UaW1lWmVybywgQ01UaW1lKQogI2RlZmluZSBBVk1lZGlhVHlwZU1ldGFkYXRhIGdldEFW TWVkaWFUeXBlTWV0YWRhdGEoKQogI2RlZmluZSBBVlBsYXllckl0ZW1EaWRQbGF5VG9FbmRUaW1l Tm90aWZpY2F0aW9uIGdldEFWUGxheWVySXRlbURpZFBsYXlUb0VuZFRpbWVOb3RpZmljYXRpb24o KQogI2RlZmluZSBBVlVSTEFzc2V0SW5oZXJpdFVSSVF1ZXJ5Q29tcG9uZW50RnJvbVJlZmVyZW5j aW5nVVJJS2V5IGdldEFWVVJMQXNzZXRJbmhlcml0VVJJUXVlcnlDb21wb25lbnRGcm9tUmVmZXJl bmNpbmdVUklLZXkoKQorI2RlZmluZSBBVlVSTEFzc2V0Q2xpZW50QnVuZGxlSWRlbnRpZmllcktl eSBnZXRBVlVSTEFzc2V0Q2xpZW50QnVuZGxlSWRlbnRpZmllcktleSgpCiAjZGVmaW5lIEFWQXNz ZXRJbWFnZUdlbmVyYXRvckFwZXJ0dXJlTW9kZUNsZWFuQXBlcnR1cmUgZ2V0QVZBc3NldEltYWdl R2VuZXJhdG9yQXBlcnR1cmVNb2RlQ2xlYW5BcGVydHVyZSgpCiAjZGVmaW5lIEFWVVJMQXNzZXRS ZWZlcmVuY2VSZXN0cmljdGlvbnNLZXkgZ2V0QVZVUkxBc3NldFJlZmVyZW5jZVJlc3RyaWN0aW9u c0tleSgpCiAjZGVmaW5lIEFWTGF5ZXJWaWRlb0dyYXZpdHlSZXNpemVBc3BlY3QgZ2V0QVZMYXll clZpZGVvR3Jhdml0eVJlc2l6ZUFzcGVjdCgpCkBAIC02NjAsNiArNjYzLDEwIEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlQVZBc3NldEZvclVSTChjb25z dCBTdHJpbmcmIHVybCkKICAgICBpZiAocGxheWVyKCktPmRvZXNIYXZlQXR0cmlidXRlKCJ4LWl0 dW5lcy1pbmhlcml0LXVyaS1xdWVyeS1jb21wb25lbnQiKSkKICAgICAgICAgW29wdGlvbnMuZ2V0 KCkgc2V0T2JqZWN0OiBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6IFRSVUVdIGZvcktleTogQVZV UkxBc3NldEluaGVyaXRVUklRdWVyeUNvbXBvbmVudEZyb21SZWZlcmVuY2luZ1VSSUtleV07CiAK KyAgICBTdHJpbmcgaWRlbnRpZmllciA9IHBsYXllcigpLT5zb3VyY2VBcHBsaWNhdGlvbklkZW50 aWZpZXIoKTsKKyAgICBpZiAoIWlkZW50aWZpZXIuaXNFbXB0eSgpICYmIEFWVVJMQXNzZXRDbGll bnRCdW5kbGVJZGVudGlmaWVyS2V5KQorICAgICAgICBbb3B0aW9ucyBzZXRPYmplY3Q6aWRlbnRp ZmllciBmb3JLZXk6QVZVUkxBc3NldENsaWVudEJ1bmRsZUlkZW50aWZpZXJLZXldOworCiAjaWYg RU5BQkxFKEFWRl9DQVBUSU9OUykKICAgICBjb25zdCBWZWN0b3I8UmVmUHRyPFBsYXRmb3JtVGV4 dFRyYWNrPj4mIG91dE9mQmFuZFRyYWNrU291cmNlcyA9IHBsYXllcigpLT5vdXRPZkJhbmRUcmFj a1NvdXJjZXMoKTsKICAgICBpZiAoIW91dE9mQmFuZFRyYWNrU291cmNlcy5pc0VtcHR5KCkpIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya2luZ0Nv bnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya2luZ0NvbnRl eHQuaAppbmRleCBmY2ZmYzA0ZWExMzY3ODJmMzllNjc2OWJhNDgzNGJhY2RmMDdkMDYwLi40MDkw OGVmZGIyNTVlNWNiN2M3MzJkYWIzNjg3NjI0N2YwNTUyYjk0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtpbmdDb250ZXh0LmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JraW5nQ29udGV4dC5oCkBAIC01Nyw2ICs1 Nyw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIFJlc291cmNlRXJyb3IgYmxvY2tlZEVycm9yKGNv bnN0IFJlc291cmNlUmVxdWVzdCYpIGNvbnN0ID0gMDsKICNlbmRpZgogCisgICAgdmlydHVhbCBT dHJpbmcgc291cmNlQXBwbGljYXRpb25JZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gZW1wdHlT dHJpbmcoKTsgfQorCiAjaWYgUExBVEZPUk0oQ09DT0EpIHx8IFVTRShDRk5FVFdPUkspIHx8IFVT RShTT1VQKQogICAgIHZpcnR1YWwgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzdG9yYWdlU2Vzc2lv bigpIGNvbnN0ID0gMDsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2Vi Q29yZVN1cHBvcnQvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5oIGIvU291cmNlL1dlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5oCmluZGV4IGViMjBj ZmRhNWVlZTIzNTc4NTI0OTFmZmMzMzQxN2JlOTkyOWJkYjcuLjgyMjZjOGU1YjQ5MmI1YjU4ZjVi MzhlOTEwY2MzYWFmMmQzZDhkOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0LmgKQEAgLTU1LDYg KzU1LDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIGJvb2wgbG9jYWxGaWxlQ29udGVudFNuaWZm aW5nRW5hYmxlZCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgU2NoZWR1bGVQYWlySGFz aFNldCogc2NoZWR1bGVkUnVuTG9vcFBhaXJzKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVh bCBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSgpIGNvbnN0 IG92ZXJyaWRlOworICAgIHZpcnR1YWwgU3RyaW5nIHNvdXJjZUFwcGxpY2F0aW9uSWRlbnRpZmll cigpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciBi bG9ja2VkRXJyb3IoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JikgY29uc3Qgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCBXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHN0b3JhZ2VT ZXNzaW9uKCkgY29uc3Qgb3ZlcnJpZGU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFj L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW0gYi9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tCmluZGV4 IDFiMTVlYWIyMzMwNDNiNTg2ZTA2MjljYzU0MjI0N2YzYzE1MzYwOTQuLjg5NjA2N2E1NDExZDBh NDk5MzkxYzU2M2U0OTVlZDJkNGFmZWM4NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFj L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW0KKysrIGIvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dC5tbQpA QCAtMTA0LDYgKzEwNCwxMSBAQCBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBXZWJGcmFtZU5ldHdvcmtp bmdDb250ZXh0Ojpzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSgpIGNvbgogICAgIHJldHVybiBy ZWludGVycHJldF9jYXN0PENGRGF0YVJlZj4od2Vidmlldy5fc291cmNlQXBwbGljYXRpb25BdWRp dERhdGEpOwogfQogCitTdHJpbmcgV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dDo6c291cmNlQXBw bGljYXRpb25JZGVudGlmaWVyKCkgY29uc3QKK3sKKyAgICByZXR1cm4gW1tOU0J1bmRsZSBtYWlu QnVuZGxlXSBidW5kbGVJZGVudGlmaWVyXTsKK30KKwogUmVzb3VyY2VFcnJvciBXZWJGcmFtZU5l dHdvcmtpbmdDb250ZXh0OjpibG9ja2VkRXJyb3IoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0KSBjb25zdAogewogICAgIHJldHVybiBmcmFtZSgpLT5sb2FkZXIoKS5jbGllbnQoKS5ibG9j a2VkRXJyb3IocmVxdWVzdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvUmVtb3RlTmV0d29ya2luZ0NvbnRleHQuaAppbmRleCBmNWNjY2MxZDEzMWM0MzY1ZGE5 ZTM3NjY1YjkzN2Q3NDIxMGRjOWQ0Li4xZmEzMmUyNmM4ZjkyMmQ4MzViMGM5ZWMyMmFlNzIwMWQ5 NWIyMTI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9SZW1vdGVO ZXR3b3JraW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL1Jl bW90ZU5ldHdvcmtpbmdDb250ZXh0LmgKQEAgLTY0LDYgKzY0LDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHNldExvY2FsRmlsZUNvbnRlbnRTbmlmZmluZ0VuYWJsZWQoYm9vbCB2YWx1ZSkgeyBtX2xv Y2FsRmlsZUNvbnRlbnRTbmlmZmluZ0VuYWJsZWQgPSB2YWx1ZTsgfQogICAgIHZpcnR1YWwgYm9v bCBsb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVkKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAg dmlydHVhbCBSZXRhaW5QdHI8Q0ZEYXRhUmVmPiBzb3VyY2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSgp IGNvbnN0IG92ZXJyaWRlOworICAgIHZpcnR1YWwgU3RyaW5nIHNvdXJjZUFwcGxpY2F0aW9uSWRl bnRpZmllcigpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6UmVzb3VyY2VF cnJvciBibG9ja2VkRXJyb3IoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JikgY29uc3Qg b3ZlcnJpZGU7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvbWFjL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0Lm1tIGIvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvbWFjL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0Lm1tCmluZGV4IDViOWViMzg4 Y2QzYjIzZmU2YmEyMWM5ZGQ3NjZiM2JkMDZkZjYxYTYuLmIzMjFlZmJiOGE4ZDIxZjI4MDZkYWIw MDNjNmZiNzUzYjc5OWU1NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9j ZXNzL21hYy9SZW1vdGVOZXR3b3JraW5nQ29udGV4dC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9tYWMvUmVtb3RlTmV0d29ya2luZ0NvbnRleHQubW0KQEAgLTgwLDYgKzgw LDExIEBAIFJldGFpblB0cjxDRkRhdGFSZWY+IFJlbW90ZU5ldHdvcmtpbmdDb250ZXh0Ojpzb3Vy Y2VBcHBsaWNhdGlvbkF1ZGl0RGF0YSgpIGNvbnN0CiAjZW5kaWYKIH0KIAorU3RyaW5nIFJlbW90 ZU5ldHdvcmtpbmdDb250ZXh0Ojpzb3VyY2VBcHBsaWNhdGlvbklkZW50aWZpZXIoKSBjb25zdAor eworICAgIHJldHVybiBTZXNzaW9uVHJhY2tlcjo6Z2V0SWRlbnRpZmllckJhc2UoKTsKK30KKwog UmVzb3VyY2VFcnJvciBSZW1vdGVOZXR3b3JraW5nQ29udGV4dDo6YmxvY2tlZEVycm9yKGNvbnN0 IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkgY29uc3QKIHsKICAgICByZXR1cm4gV2ViS2l0Ojpi bG9ja2VkRXJyb3IocmVxdWVzdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0LmggYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJGcmFtZU5ldHdvcmtp bmdDb250ZXh0LmgKaW5kZXggZGVmMjAzODdmYzI4ODhkODk3YWM0Yzk2YmE0Y2FlZDdmNDZiNzM1 ZC4uZmRlNmQ3ODRjNmNhZDEyNjI2OTExYzMyNGVmODQ4ZDQ1NDkyM2QwMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3 b3JraW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvbWFjL1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQuaApAQCAtNTcsNiArNTcsNyBAQCBw cml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBsb2NhbEZpbGVDb250ZW50U25pZmZpbmdFbmFibGVk KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBTY2hlZHVsZVBhaXJIYXNoU2V0KiBzY2hl ZHVsZWRSdW5Mb29wUGFpcnMoKSBjb25zdCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFJldGFpblB0 cjxDRkRhdGFSZWY+IHNvdXJjZUFwcGxpY2F0aW9uQXVkaXREYXRhKCkgY29uc3Qgb3ZlcnJpZGU7 CisgICAgdmlydHVhbCBTdHJpbmcgc291cmNlQXBwbGljYXRpb25JZGVudGlmaWVyKCkgY29uc3Qg b3ZlcnJpZGU7CiAgICAgdmlydHVhbCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yIGJsb2NrZWRFcnJv cihjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKSBjb25zdCBvdmVycmlkZTsKICAgICB2 aXJ0dWFsIFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc3RvcmFnZVNlc3Npb24oKSBj b25zdCBvdmVycmlkZTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L21hYy9XZWJGcmFtZU5ldHdvcmtpbmdDb250ZXh0Lm1tIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2ViRnJhbWVOZXR3b3JraW5n Q29udGV4dC5tbQppbmRleCBiYmM5MmQ5YzNkNDE4ZDkxY2U4ZThiOTZiMmJiNjBkZTE3ZThiMGYz Li41ZWRiNDI1MTYwZTQ0ZGZlNGE0OTcyMDZlM2VmOTM1M2NlNjFiMTFlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJGcmFtZU5ldHdv cmtpbmdDb250ZXh0Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvbWFjL1dlYkZyYW1lTmV0d29ya2luZ0NvbnRleHQubW0KQEAgLTEwMSw2ICsxMDEsMTEg QEAgUmV0YWluUHRyPENGRGF0YVJlZj4gV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dDo6c291cmNl QXBwbGljYXRpb25BdWRpdERhdGEoKSBjb24KICNlbmRpZgogfQogCitTdHJpbmcgV2ViRnJhbWVO ZXR3b3JraW5nQ29udGV4dDo6c291cmNlQXBwbGljYXRpb25JZGVudGlmaWVyKCkgY29uc3QKK3sK KyAgICByZXR1cm4gU2Vzc2lvblRyYWNrZXI6OmdldElkZW50aWZpZXJCYXNlKCk7Cit9CisKIFJl c291cmNlRXJyb3IgV2ViRnJhbWVOZXR3b3JraW5nQ29udGV4dDo6YmxvY2tlZEVycm9yKGNvbnN0 IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkgY29uc3QKIHsKICAgICByZXR1cm4gZnJhbWUoKS0+ bG9hZGVyKCkuY2xpZW50KCkuYmxvY2tlZEVycm9yKHJlcXVlc3QpOwo=