127505 2014-01-23 12:31:37 -0800 [iOS] Protect against possible deadlock by delaying video layer creation 2014-01-25 07:41:09 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 jer.noble jer.noble commit-queue darin eric.carlson glenn oldest_to_newest 971285 0 jer.noble 2014-01-23 12:31:37 -0800 [Mac] Protect against possbile deadlock by delaying video layer creation 971287 1 222017 jer.noble 2014-01-23 12:36:54 -0800 Created attachment 222017 Patch 971290 2 222017 eric.carlson 2014-01-23 12:40:48 -0800 Comment on attachment 222017 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222017&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:429 > if (!m_videoLayer) { You could add "|| m_videoLayer" to the early return above and get rid of this test. 971304 3 222017 eric.carlson 2014-01-23 13:04:35 -0800 Comment on attachment 222017 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222017&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:430 > + callOnMainThread([this] { This should return if m_videoLayer is non-NULL. 971327 4 222025 jer.noble 2014-01-23 13:47:50 -0800 Created attachment 222025 Patch for landing 971484 5 222025 commit-queue 2014-01-23 20:27:47 -0800 Comment on attachment 222025 Patch for landing Rejecting attachment 222025 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 222025, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/6479526041223168 971485 6 222072 jer.noble 2014-01-23 20:35:35 -0800 Created attachment 222072 Patch for landing 971486 7 222072 jer.noble 2014-01-23 20:36:07 -0800 Comment on attachment 222072 Patch for landing Now with fewer OOPS. 971495 8 222072 commit-queue 2014-01-23 21:11:11 -0800 Comment on attachment 222072 Patch for landing Clearing flags on attachment: 222072 Committed r162686: <http://trac.webkit.org/changeset/162686> 222017 2014-01-23 12:36:54 -0800 2014-01-24 09:05:46 -0800 Patch bug-127505-20140123123653.patch text/plain 2927 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQ3NTZhNzYzMGNlMmE1 NmYyMjVkMjhjOGExN2EwZWRiZTkxNDE0ZS4uNmZhNzI3MTc1YTE5NTdlMWM0MWJlZGFhOTM2NDE1 ZmMwNjE5MjQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDE0LTAxLTIzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtpT1NdIFByb3RlY3QgYWdh aW5zdCBwb3NzYmlsZSBkZWFkbG9jayBieSBkZWxheWluZyB2aWRlbyBsYXllciBjcmVhdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NTA1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV29yayBhcm91 bmQgYSBwb3NzaWJsZSBkZWFkbG9jayBvbiBpT1Mgd2hlbiBjcmVhdGluZyBhIG1lZGlhIGVsZW1l bnQKKyAgICAgICAgYmFja2VkIGJ5IEFWRm91bmRhdGlvbiBieSBkZWxheWluZyBjcmVhdGlvbiBv ZiB0aGUgQVZQbGF5ZXJMYXllci4KKyAgICAgICAgVGhlIGRlYWRsb2NrIGNhbiBvY2N1ciB3aGVu IHRoZSB3ZWIgdGhyZWFkIGlzIGRvaW5nIENBTGF5ZXIgbGF5b3V0CisgICAgICAgIHdoaWxlIHRh a2luZyB0aGUgd2ViIHRocmVhZCBsb2NrLCB3aGlsZSBDb3JlTWVkaWEgaXMgZG9pbmcgcHJvcGVy dHkKKyAgICAgICAgYWNjZXNzIG9uIGFuIGFzeW5jIHRocmVhZCB3aGlsZSB0YWtpbmcgdGhlIENN IGxvY2ssIGFuZCBlYWNoIGlzIHdhaXRpbmcKKyAgICAgICAgZm9yIHRoZSBvdGhlcidzIGxvY2sg dG8gYmUgcmVsZWFzZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9M YXllcik6CisKKzIwMTQtMDEtMjMgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisK ICAgICAgICAgW01TRV1bTWFjXSBBZG9wdCBuZXcgQVZTdHJlYW1EYXRhUGFyc2VyIGRlbGVnYXRl IEFQSQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3 NDk4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmluZGV4IDk3YTcxZjAwOTZmMzZlMGIwYmY5NjMy NjhkNGRlOTVjY2Y4NTVjMzQuLjQwNjg2MTg4MzA5YjQ4YWM3ZDY0YWJjZTNhZTZkYThiNTE3Yjg4 MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAtNDI3LDE0ICs0MjcsMTggQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xheWVyKCkKICAg ICAgICAgcmV0dXJuOwogCiAgICAgaWYgKCFtX3ZpZGVvTGF5ZXIpIHsKLSAgICAgICAgbV92aWRl b0xheWVyID0gYWRvcHROUyhbW0FWUGxheWVyTGF5ZXIgYWxsb2NdIGluaXRdKTsKLSAgICAgICAg W21fdmlkZW9MYXllci5nZXQoKSBzZXRQbGF5ZXI6bV9hdlBsYXllci5nZXQoKV07Ci0gICAgICAg IFttX3ZpZGVvTGF5ZXIuZ2V0KCkgc2V0QmFja2dyb3VuZENvbG9yOmNhY2hlZENHQ29sb3IoQ29s b3I6OmJsYWNrLCBDb2xvclNwYWNlRGV2aWNlUkdCKV07CisgICAgICAgIGNhbGxPbk1haW5UaHJl YWQoW3RoaXNdIHsKKyAgICAgICAgICAgIG1fdmlkZW9MYXllciA9IGFkb3B0TlMoW1tBVlBsYXll ckxheWVyIGFsbG9jXSBpbml0XSk7CisgICAgICAgICAgICBbbV92aWRlb0xheWVyLmdldCgpIHNl dFBsYXllcjptX2F2UGxheWVyLmdldCgpXTsKKyAgICAgICAgICAgIFttX3ZpZGVvTGF5ZXIuZ2V0 KCkgc2V0QmFja2dyb3VuZENvbG9yOmNhY2hlZENHQ29sb3IoQ29sb3I6OmJsYWNrLCBDb2xvclNw YWNlRGV2aWNlUkdCKV07CiAjaWZuZGVmIE5ERUJVRwotICAgICAgICBbbV92aWRlb0xheWVyLmdl dCgpIHNldE5hbWU6QCJWaWRlbyBsYXllciJdOworICAgICAgICAgICAgW21fdmlkZW9MYXllci5n ZXQoKSBzZXROYW1lOkAiVmlkZW8gbGF5ZXIiXTsKICNlbmRpZgotICAgICAgICB1cGRhdGVWaWRl b0xheWVyR3Jhdml0eSgpOwotICAgICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xheWVyKCVwKSAtIHJldHVybmluZyAlcCIsIHRo aXMsIG1fdmlkZW9MYXllci5nZXQoKSk7CisgICAgICAgICAgICB1cGRhdGVWaWRlb0xheWVyR3Jh dml0eSgpOworICAgICAgICAgICAgTE9HKE1lZGlhLCAiTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9MYXllciglcCkgLSByZXR1cm5pbmcgJXAiLCB0aGlzLCBt X3ZpZGVvTGF5ZXIuZ2V0KCkpOworCisgICAgICAgICAgICBwbGF5ZXIoKS0+bWVkaWFQbGF5ZXJD bGllbnQoKS0+bWVkaWFQbGF5ZXJSZW5kZXJpbmdNb2RlQ2hhbmdlZChwbGF5ZXIoKSk7CisgICAg ICAgIH0pOwogICAgIH0KIH0KIAo= 222025 2014-01-23 13:47:50 -0800 2014-01-23 20:35:51 -0800 Patch for landing bug-127505-20140123134749.patch text/plain 2727 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQ3NTZhNzYzMGNlMmE1 NmYyMjVkMjhjOGExN2EwZWRiZTkxNDE0ZS4uNmZhNzI3MTc1YTE5NTdlMWM0MWJlZGFhOTM2NDE1 ZmMwNjE5MjQxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDE0LTAxLTIzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtpT1NdIFByb3RlY3QgYWdh aW5zdCBwb3NzYmlsZSBkZWFkbG9jayBieSBkZWxheWluZyB2aWRlbyBsYXllciBjcmVhdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NTA1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV29yayBhcm91 bmQgYSBwb3NzaWJsZSBkZWFkbG9jayBvbiBpT1Mgd2hlbiBjcmVhdGluZyBhIG1lZGlhIGVsZW1l bnQKKyAgICAgICAgYmFja2VkIGJ5IEFWRm91bmRhdGlvbiBieSBkZWxheWluZyBjcmVhdGlvbiBv ZiB0aGUgQVZQbGF5ZXJMYXllci4KKyAgICAgICAgVGhlIGRlYWRsb2NrIGNhbiBvY2N1ciB3aGVu IHRoZSB3ZWIgdGhyZWFkIGlzIGRvaW5nIENBTGF5ZXIgbGF5b3V0CisgICAgICAgIHdoaWxlIHRh a2luZyB0aGUgd2ViIHRocmVhZCBsb2NrLCB3aGlsZSBDb3JlTWVkaWEgaXMgZG9pbmcgcHJvcGVy dHkKKyAgICAgICAgYWNjZXNzIG9uIGFuIGFzeW5jIHRocmVhZCB3aGlsZSB0YWtpbmcgdGhlIENN IGxvY2ssIGFuZCBlYWNoIGlzIHdhaXRpbmcKKyAgICAgICAgZm9yIHRoZSBvdGhlcidzIGxvY2sg dG8gYmUgcmVsZWFzZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9M YXllcik6CisKKzIwMTQtMDEtMjMgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisK ICAgICAgICAgW01TRV1bTWFjXSBBZG9wdCBuZXcgQVZTdHJlYW1EYXRhUGFyc2VyIGRlbGVnYXRl IEFQSQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3 NDk4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCmluZGV4IDk3YTcxZjAwOTZmMzZlMGIwYmY5NjMy NjhkNGRlOTVjY2Y4NTVjMzQuLjZiYzM5NWZkZTRmY2YyOTU2OTZlZDJlZjk3YzM1Y2M0ODI5NjY2 ZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAtNDIzLDEwICs0MjMsMTMgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpkZXN0cm95SW1hZ2VHZW5lcmF0b3Io KQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVv TGF5ZXIoKQogewotICAgIGlmICghbV9hdlBsYXllcikKKyAgICBpZiAoIW1fYXZQbGF5ZXIgfHwg bV92aWRlb0xheWVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIW1fdmlkZW9MYXllcikg eworICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXNdIHsKKyAgICAgICAgaWYgKCFtX2F2UGxheWVy IHx8IG1fdmlkZW9MYXllcikKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBtX3ZpZGVv TGF5ZXIgPSBhZG9wdE5TKFtbQVZQbGF5ZXJMYXllciBhbGxvY10gaW5pdF0pOwogICAgICAgICBb bV92aWRlb0xheWVyLmdldCgpIHNldFBsYXllcjptX2F2UGxheWVyLmdldCgpXTsKICAgICAgICAg W21fdmlkZW9MYXllci5nZXQoKSBzZXRCYWNrZ3JvdW5kQ29sb3I6Y2FjaGVkQ0dDb2xvcihDb2xv cjo6YmxhY2ssIENvbG9yU3BhY2VEZXZpY2VSR0IpXTsKQEAgLTQzNSw3ICs0MzgsOSBAQCB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvTGF5ZXIoKQog I2VuZGlmCiAgICAgICAgIHVwZGF0ZVZpZGVvTGF5ZXJHcmF2aXR5KCk7CiAgICAgICAgIExPRyhN ZWRpYSwgIk1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvTGF5 ZXIoJXApIC0gcmV0dXJuaW5nICVwIiwgdGhpcywgbV92aWRlb0xheWVyLmdldCgpKTsKLSAgICB9 CisKKyAgICAgICAgcGxheWVyKCktPm1lZGlhUGxheWVyQ2xpZW50KCktPm1lZGlhUGxheWVyUmVu ZGVyaW5nTW9kZUNoYW5nZWQocGxheWVyKCkpOworICAgIH0pOwogfQogCiB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmRlc3Ryb3lWaWRlb0xheWVyKCkK 222072 2014-01-23 20:35:35 -0800 2014-01-23 21:11:11 -0800 Patch for landing bug-127505-20140123203534.patch text/plain 2725 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzQ3NTZhNzYzMGNlMmE1 NmYyMjVkMjhjOGExN2EwZWRiZTkxNDE0ZS4uOTFlZDI5ZjhlY2IyM2JlM2FiYjcyYjE0ZjIxYjIx ODZmNzZlNTQwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDE0LTAxLTIzICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtpT1NdIFByb3RlY3QgYWdh aW5zdCBwb3NzYmlsZSBkZWFkbG9jayBieSBkZWxheWluZyB2aWRlbyBsYXllciBjcmVhdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NTA1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgIFdvcmsgYXJvdW5k IGEgcG9zc2libGUgZGVhZGxvY2sgb24gaU9TIHdoZW4gY3JlYXRpbmcgYSBtZWRpYSBlbGVtZW50 CisgICAgICAgIGJhY2tlZCBieSBBVkZvdW5kYXRpb24gYnkgZGVsYXlpbmcgY3JlYXRpb24gb2Yg dGhlIEFWUGxheWVyTGF5ZXIuCisgICAgICAgIFRoZSBkZWFkbG9jayBjYW4gb2NjdXIgd2hlbiB0 aGUgd2ViIHRocmVhZCBpcyBkb2luZyBDQUxheWVyIGxheW91dAorICAgICAgICB3aGlsZSB0YWtp bmcgdGhlIHdlYiB0aHJlYWQgbG9jaywgd2hpbGUgQ29yZU1lZGlhIGlzIGRvaW5nIHByb3BlcnR5 CisgICAgICAgIGFjY2VzcyBvbiBhbiBhc3luYyB0aHJlYWQgd2hpbGUgdGFraW5nIHRoZSBDTSBs b2NrLCBhbmQgZWFjaCBpcyB3YWl0aW5nCisgICAgICAgIGZvciB0aGUgb3RoZXIncyBsb2NrIHRv IGJlIHJlbGVhc2VkLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9u L29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvTGF5 ZXIpOgorCisyMDE0LTAxLTIzICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCiAg ICAgICAgIFtNU0VdW01hY10gQWRvcHQgbmV3IEFWU3RyZWFtRGF0YVBhcnNlciBkZWxlZ2F0ZSBB UEkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzQ5 OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCA5N2E3MWYwMDk2ZjM2ZTBiMGJmOTYzMjY4 ZDRkZTk1Y2NmODU1YzM0Li42YmMzOTVmZGU0ZmNmMjk1Njk2ZWQyZWY5N2MzNWNjNDgyOTY2NmU3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAgLTQyMywxMCArNDIzLDEzIEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6ZGVzdHJveUltYWdlR2VuZXJhdG9yKCkK IAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xh eWVyKCkKIHsKLSAgICBpZiAoIW1fYXZQbGF5ZXIpCisgICAgaWYgKCFtX2F2UGxheWVyIHx8IG1f dmlkZW9MYXllcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKCFtX3ZpZGVvTGF5ZXIpIHsK KyAgICBjYWxsT25NYWluVGhyZWFkKFt0aGlzXSB7CisgICAgICAgIGlmICghbV9hdlBsYXllciB8 fCBtX3ZpZGVvTGF5ZXIpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgbV92aWRlb0xh eWVyID0gYWRvcHROUyhbW0FWUGxheWVyTGF5ZXIgYWxsb2NdIGluaXRdKTsKICAgICAgICAgW21f dmlkZW9MYXllci5nZXQoKSBzZXRQbGF5ZXI6bV9hdlBsYXllci5nZXQoKV07CiAgICAgICAgIFtt X3ZpZGVvTGF5ZXIuZ2V0KCkgc2V0QmFja2dyb3VuZENvbG9yOmNhY2hlZENHQ29sb3IoQ29sb3I6 OmJsYWNrLCBDb2xvclNwYWNlRGV2aWNlUkdCKV07CkBAIC00MzUsNyArNDM4LDkgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xheWVyKCkKICNl bmRpZgogICAgICAgICB1cGRhdGVWaWRlb0xheWVyR3Jhdml0eSgpOwogICAgICAgICBMT0coTWVk aWEsICJNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb0xheWVy KCVwKSAtIHJldHVybmluZyAlcCIsIHRoaXMsIG1fdmlkZW9MYXllci5nZXQoKSk7Ci0gICAgfQor CisgICAgICAgIHBsYXllcigpLT5tZWRpYVBsYXllckNsaWVudCgpLT5tZWRpYVBsYXllclJlbmRl cmluZ01vZGVDaGFuZ2VkKHBsYXllcigpKTsKKyAgICB9KTsKIH0KIAogdm9pZCBNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpkZXN0cm95VmlkZW9MYXllcigpCg==