178360 2017-10-16 13:46:36 -0700 ImageDecoderAVFObjC fails to create more CMSampleBuffers after creating about 32MB worth. 2017-10-16 17:35:17 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson webkit-bug-importer oldest_to_newest 1360942 0 jer.noble 2017-10-16 13:46:36 -0700 ImageDecoderAVFObjC fails to create more CMSampleBuffers after creating about 32MB worth. 1360945 1 323938 jer.noble 2017-10-16 13:51:38 -0700 Created attachment 323938 Patch 1361011 2 webkit-bug-importer 2017-10-16 16:37:40 -0700 <rdar://problem/35018552> 1361012 3 323938 commit-queue 2017-10-16 16:39:27 -0700 Comment on attachment 323938 Patch Rejecting attachment 323938 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 323938, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit /Volumes/Data/EWS/WebKit/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://webkit-queues.webkit.org/results/4875836 1361019 4 323957 jer.noble 2017-10-16 16:55:08 -0700 Created attachment 323957 Patch for landing 1361036 5 323957 commit-queue 2017-10-16 17:35:15 -0700 Comment on attachment 323957 Patch for landing Clearing flags on attachment: 323957 Committed r223452: <https://trac.webkit.org/changeset/223452> 1361037 6 commit-queue 2017-10-16 17:35:17 -0700 All reviewed patches have been landed. Closing bug. 323938 2017-10-16 13:51:38 -0700 2017-10-16 16:55:07 -0700 Patch bug-178360-20171016135138.patch text/plain 9430 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmZmZTIwZDNlMDRmMDFm ZmI1YTY2NTAwZmFhMGM0YThhNzY3ODY2Ny4uOWQ2ZDc3NmU5NTFlOWY5ZTdjNmNmZWRkOTBkMzk3 NzM2MjBjY2QzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE3LTEwLTE2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEltYWdlRGVjb2RlckFWRk9i akMgZmFpbHMgdG8gY3JlYXRlIG1vcmUgQ01TYW1wbGVCdWZmZXJzIGFmdGVyIGNyZWF0aW5nIGFi b3V0IDMyTUIgd29ydGguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzgzNjAKKworICAgICAgICBBVlNhbXBsZUJ1ZmZlckdlbmVyYXRvciBoYXMgYSBj b25zdHJhaW5lZCBtZW1vcnkgcG9vbCBvZiBhYm91dCAzMk1CIGluIHNpemUuIE9uY2UKKyAgICAg ICAgQ01TYW1wbGVCdWZmZXJzIHJlcHJlc2VudGluZyBhYm91dCAzMk1CIG9mIG1lbW9yeSBhcmUg YWxsb2NhdGVkLCBubyBtb3JlIGNhbiBiZSBjcmVhdGVkCisgICAgICAgIHVudGlsIHByZXZpb3Vz bHkgY3JlYXRlZCBvbmVzIGFyZSByZWxlYXNlZC4gU28gcmF0aGVyIHRoYW4gKG9ubHkpIGNyZWF0 aW5nIHRoZSBzYW1wbGUKKyAgICAgICAgYnVmZmVycyB1cCBmcm9udCBpbiByZWFkU2FtcGxlTWV0 YWRhdGEoKSwgYWxzbyBjcmVhdGUgdGhlbSBkeW5hbWljYWxseSwgaWYgbWlzc2luZywgaW4KKyAg ICAgICAgY3JlYXRlRnJhbWVJbWFnZUF0SW5kZXgoLi4uKSBhbmQgcmVsZWFzZSB0aGVtIGluIHN0 b3JlU2FtcGxlQnVmZmVyKC4uLikgYWZ0ZXIgdGhleSBoYXZlIGJlZW4KKyAgICAgICAgZGVjb2Rl ZC4KKworICAgICAgICBEcml2ZS1ieSBmaXg6IHRoZSBleHBlY3RlZCBjb250ZW50IGxlbmd0aCB3 YXMgbmV2ZXIgYWN0dWFsbHkgc2V0IGJ5IHRoZSBvd25lciBvZiBJbWFnZURlY29kZXJBVkZPYmpD LgorICAgICAgICBOb3cgdGhhdCB0aGUgZXhwZWN0ZWQgY29udGVudCBsZW5ndGggaXMgYXZhaWxh YmxlLCB3ZSBkb24ndCBoYXZlIHRvIHdhaXQgdW50aWwgdGhlIGRhdGEgaXMgY29tcGxldGUKKyAg ICAgICAgdG8gcmVzcG9uZCB0byByZXF1ZXN0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0ltYWdlU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlU291cmNlOjplbnN1 cmVEZWNvZGVyQXZhaWxhYmxlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9JbWFnZURlY29kZXJBVkZPYmpDLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvSW1hZ2VEZWNvZGVyQVZGT2JqQy5tbToKKyAgICAgICAg KFNPRlRfTElOS19QT0lOVEVSX09QVElPTkFMKToKKyAgICAgICAgKC1bV2ViQ29yZVNoYXJlZEJ1 ZmZlclJlc291cmNlTG9hZGVyRGVsZWdhdGUgY2FuRnVsZmlsbFJlcXVlc3Q6XSk6CisgICAgICAg ICgtW1dlYkNvcmVTaGFyZWRCdWZmZXJSZXNvdXJjZUxvYWRlckRlbGVnYXRlIGZ1bGZpbGxSZXF1 ZXN0Ol0pOgorICAgICAgICAoLVtXZWJDb3JlU2hhcmVkQnVmZmVyUmVzb3VyY2VMb2FkZXJEZWxl Z2F0ZSByZXNvdXJjZUxvYWRlcjpzaG91bGRXYWl0Rm9yTG9hZGluZ09mUmVxdWVzdGVkUmVzb3Vy Y2U6XSk6CisgICAgICAgIChXZWJDb3JlOjppbWFnZURlY29kZXJBc3NldE9wdGlvbnMpOgorICAg ICAgICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGVyQVZGT2JqQzo6Zmlyc3RFbmFibGVkVHJhY2spOgor ICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGVyQVZGT2JqQzo6c3RvcmVTYW1wbGVCdWZmZXIp OgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGVyQVZGT2JqQzo6Y3JlYXRlRnJhbWVJbWFn ZUF0SW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGVyQVZGT2JqQzo6c2V0RXhw ZWN0ZWRDb250ZW50U2l6ZSk6CisKIDIwMTctMTAtMTMgIEplciBOb2JsZSAgPGplci5ub2JsZUBh cHBsZS5jb20+CiAKICAgICAgICAgUGVyZm9ybWFuY2U6IFNraXAgdGV4dHVyZSB1cGxvYWQgaWYg c291cmNlIGltYWdlIGFuZCBkZXN0aW5hdGlvbiB0ZXh0dXJlIGhhdmVuJ3QgY2hhbmdlZApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuY3BwCmluZGV4 IDBjOTVlNDgyYWU2Y2M1MDQyODY4MTlmY2ZjYTU2YjIwNjdhMzI2MDkuLmI5NzY5OGViMjRhYzc3 Y2IzZDg3NWE5ZjhiZjJjNjdjMDI1MzNmNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ltYWdlU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9JbWFnZVNvdXJjZS5jcHAKQEAgLTc5LDYgKzc5LDkgQEAgYm9vbCBJbWFn ZVNvdXJjZTo6ZW5zdXJlRGVjb2RlckF2YWlsYWJsZShTaGFyZWRCdWZmZXIqIGRhdGEpCiAgICAg aWYgKCFpc0RlY29kZXJBdmFpbGFibGUoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAg aWYgKGF1dG8gZXhwZWN0ZWRDb250ZW50TGVuZ3RoID0gbV9mcmFtZUNhY2hlLT5leHBlY3RlZENv bnRlbnRMZW5ndGgoKSkKKyAgICAgICAgbV9kZWNvZGVyLT5zZXRFeHBlY3RlZENvbnRlbnRTaXpl KGV4cGVjdGVkQ29udGVudExlbmd0aCk7CisKICAgICBtX2ZyYW1lQ2FjaGUtPnNldERlY29kZXIo bV9kZWNvZGVyLmdldCgpKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0ltYWdlRGVjb2Rl ckFWRk9iakMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL0ltYWdlRGVjb2RlckFWRk9iakMuaAppbmRleCA2ZmFlMjE4M2M4NTI4OWRlOGRhZGJj N2MxYWUyYTY5YzU4MDhjMDg2Li5iYTExNTYyYjI2OThjY2JhY2MwZThiNDk5NzMyNmVhYjdiYzAy ZDI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9JbWFnZURlY29kZXJBVkZPYmpDLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvSW1hZ2VEZWNvZGVyQVZGT2JqQy5oCkBA IC0xMTksNyArMTE5LDYgQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8U2FtcGxlRGF0YT4gbV9zYW1w bGVEYXRhOwogICAgIExvY2sgbV9zYW1wbGVHZW5lcmF0b3JMb2NrOwogICAgIGJvb2wgbV9pc0Fs bERhdGFSZWNlaXZlZCB7IGZhbHNlIH07Ci0gICAgbG9uZyBsb25nIG1fZXhwZWN0ZWRDb250ZW50 U2l6ZSB7IDAgfTsKICAgICBzdGQ6Om9wdGlvbmFsPEludFNpemU+IG1fc2l6ZTsKICAgICBzdGQ6 Om9wdGlvbmFsPFJvdGF0aW9uUHJvcGVydGllcz4gbV9yb3RhdGlvbjsKIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9JbWFn ZURlY29kZXJBVkZPYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvSW1hZ2VEZWNvZGVyQVZGT2JqQy5tbQppbmRleCA1ZmRkYjg1MjEyZmI4 YjdlZDBmNWJhZTA4ZDMxYzJhZWRmYzZhYmU2Li40ZmJiN2JhY2I2YmVkOGViMmY1NTIzNzRjMTgx N2UwMTI4ZGNiMDBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9JbWFnZURlY29kZXJBVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0ltYWdlRGVjb2RlckFW Rk9iakMubW0KQEAgLTMyLDYgKzMyLDcgQEAKICNpbXBvcnQgIkZsb2F0UXVhZC5oIgogI2ltcG9y dCAiRmxvYXRSZWN0LmgiCiAjaW1wb3J0ICJGbG9hdFNpemUuaCIKKyNpbXBvcnQgIkxvZ2dpbmcu aCIKICNpbXBvcnQgIk1JTUVUeXBlUmVnaXN0cnkuaCIKICNpbXBvcnQgIlNoYXJlZEJ1ZmZlci5o IgogI2ltcG9ydCAiVVRJVXRpbGl0aWVzLmgiCkBAIC02Myw4ICs2NCwxMCBAQCBTT0ZUX0xJTktf Q0xBU1NfT1BUSU9OQUwoQVZGb3VuZGF0aW9uLCBBVlNhbXBsZUJ1ZmZlckdlbmVyYXRvcikKIFNP RlRfTElOS19DTEFTU19PUFRJT05BTChBVkZvdW5kYXRpb24sIEFWU2FtcGxlQnVmZmVyUmVxdWVz dCkKIFNPRlRfTElOS19QT0lOVEVSX09QVElPTkFMKEFWRm91bmRhdGlvbiwgQVZNZWRpYUNoYXJh Y3RlcmlzdGljVmlzdWFsLCBOU1N0cmluZyAqKQogU09GVF9MSU5LX1BPSU5URVJfT1BUSU9OQUwo QVZGb3VuZGF0aW9uLCBBVlVSTEFzc2V0UmVmZXJlbmNlUmVzdHJpY3Rpb25zS2V5LCBOU1N0cmlu ZyAqKQorU09GVF9MSU5LX1BPSU5URVJfT1BUSU9OQUwoQVZGb3VuZGF0aW9uLCBBVlVSTEFzc2V0 VXNlc05vUGVyc2lzdGVudENhY2hlS2V5LCBOU1N0cmluZyAqKQogI2RlZmluZSBBVk1lZGlhQ2hh cmFjdGVyaXN0aWNWaXN1YWwgZ2V0QVZNZWRpYUNoYXJhY3RlcmlzdGljVmlzdWFsKCkKICNkZWZp bmUgQVZVUkxBc3NldFJlZmVyZW5jZVJlc3RyaWN0aW9uc0tleSBnZXRBVlVSTEFzc2V0UmVmZXJl bmNlUmVzdHJpY3Rpb25zS2V5KCkKKyNkZWZpbmUgQVZVUkxBc3NldFVzZXNOb1BlcnNpc3RlbnRD YWNoZUtleSBnZXRBVlVSTEFzc2V0VXNlc05vUGVyc2lzdGVudENhY2hlS2V5KCkKIAogI3ByYWdt YSBtYXJrIC0KIApAQCAtMTI3LDcgKzEzMCw3IEBAIC0gKEJPT0wpY2FuRnVsZmlsbFJlcXVlc3Q6 KEFWQXNzZXRSZXNvdXJjZUxvYWRpbmdSZXF1ZXN0ICopcmVxdWVzdAogICAgICAgICByZXR1cm4g Tk87CiAKICAgICBpZiAoYXV0byBkYXRhUmVxdWVzdCA9IHJlcXVlc3QuZGF0YVJlcXVlc3QpIHsK LSAgICAgICAgaWYgKGRhdGFSZXF1ZXN0LnJlcXVlc3RlZE9mZnNldCArIGRhdGFSZXF1ZXN0LnJl cXVlc3RlZExlbmd0aCA+IHN0YXRpY19jYXN0PGxvbmcgbG9uZz4oX2RhdGEuZ2V0KCkubGVuZ3Ro KSkKKyAgICAgICAgaWYgKGRhdGFSZXF1ZXN0LnJlcXVlc3RlZE9mZnNldCA+IHN0YXRpY19jYXN0 PGxvbmcgbG9uZz4oX2RhdGEuZ2V0KCkubGVuZ3RoKSkKICAgICAgICAgICAgIHJldHVybiBOTzsK ICAgICB9CiAKQEAgLTE3Nyw2ICsxODAsMTIgQEAgLSAodm9pZClmdWxmaWxsUmVxdWVzdDooQVZB c3NldFJlc291cmNlTG9hZGluZ1JlcXVlc3QgKilyZXF1ZXN0CiAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgW2RhdGFSZXF1ZXN0IHJlc3BvbmRXaXRoRGF0YTpyZXF1ZXN0ZWREYXRhXTsK KworICAgICAgICBpZiAoZGF0YVJlcXVlc3QucmVxdWVzdHNBbGxEYXRhVG9FbmRPZlJlc291cmNl KSB7CisgICAgICAgICAgICBpZiAoIV9jb21wbGV0ZSkKKyAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgIH0gZWxzZSBpZiAoZGF0YVJlcXVlc3QucmVxdWVzdGVkT2Zmc2V0ICsgZGF0YVJl cXVlc3QucmVxdWVzdGVkTGVuZ3RoID4gZGF0YVJlcXVlc3QuY3VycmVudE9mZnNldCkKKyAgICAg ICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBbcmVxdWVzdCBmaW5pc2hMb2FkaW5nXTsKQEAg LTE5MCw3ICsxOTksOCBAQCAtIChCT09MKXJlc291cmNlTG9hZGVyOihBVkFzc2V0UmVzb3VyY2VM b2FkZXIgKilyZXNvdXJjZUxvYWRlciBzaG91bGRXYWl0Rm9yTG9hZAogCiAgICAgaWYgKFtzZWxm IGNhbkZ1bGZpbGxSZXF1ZXN0OmxvYWRpbmdSZXF1ZXN0XSkgewogICAgICAgICBbc2VsZiBmdWxm aWxsUmVxdWVzdDpsb2FkaW5nUmVxdWVzdF07Ci0gICAgICAgIHJldHVybiBOTzsKKyAgICAgICAg aWYgKGxvYWRpbmdSZXF1ZXN0LmZpbmlzaGVkKQorICAgICAgICAgICAgcmV0dXJuIE5POwogICAg IH0KIAogICAgIFtzZWxmIGVucXVldWVSZXF1ZXN0OmxvYWRpbmdSZXF1ZXN0XTsKQEAgLTIyMiw4 ICsyMzIsMTIgQEAgc3RhdGljIE5TVVJMICpjdXN0b21TY2hlbWVVUkwoKQogc3RhdGljIE5TRGlj dGlvbmFyeSAqaW1hZ2VEZWNvZGVyQXNzZXRPcHRpb25zKCkKIHsKICAgICBzdGF0aWMgTmV2ZXJE ZXN0cm95ZWQ8UmV0YWluUHRyPE5TRGljdGlvbmFyeT4+IG9wdGlvbnM7Ci0gICAgaWYgKCFvcHRp b25zLmdldCgpKQotICAgICAgICBvcHRpb25zLmdldCgpID0gQHsgQVZVUkxBc3NldFJlZmVyZW5j ZVJlc3RyaWN0aW9uc0tleTogQChBVkFzc2V0UmVmZXJlbmNlUmVzdHJpY3Rpb25Gb3JiaWRBbGwp IH07CisgICAgaWYgKCFvcHRpb25zLmdldCgpKSB7CisgICAgICAgIG9wdGlvbnMuZ2V0KCkgPSBA eworICAgICAgICAgICAgQVZVUkxBc3NldFJlZmVyZW5jZVJlc3RyaWN0aW9uc0tleTogQChBVkFz c2V0UmVmZXJlbmNlUmVzdHJpY3Rpb25Gb3JiaWRBbGwpLAorICAgICAgICAgICAgQVZVUkxBc3Nl dFVzZXNOb1BlcnNpc3RlbnRDYWNoZUtleTogQFlFUywKKyAgICAgICAgfTsKKyAgICB9CiAKICAg ICByZXR1cm4gb3B0aW9ucy5nZXQoKS5nZXQoKTsKIH0KQEAgLTMwNyw4ICszMjEsMTAgQEAgQVZB c3NldFRyYWNrICpJbWFnZURlY29kZXJBVkZPYmpDOjpmaXJzdEVuYWJsZWRUcmFjaygpCiAgICAg ICAgIHJldHVybiB0cmFjay5lbmFibGVkOwogICAgIH1dOwogCi0gICAgaWYgKGZpcnN0RW5hYmxl ZEluZGV4ID09IE5TTm90Rm91bmQpCisgICAgaWYgKGZpcnN0RW5hYmxlZEluZGV4ID09IE5TTm90 Rm91bmQpIHsKKyAgICAgICAgTE9HKEltYWdlcywgIkltYWdlRGVjb2RlckFWRk9iakM6OmZpcnN0 RW5hYmxlZFRyYWNrKCVwKSAtIGFzc2V0IGhhcyBubyBlbmFibGVkIHZpZGVvIHRyYWNrcyIsIHRo aXMpOwogICAgICAgICByZXR1cm4gbmlsOworICAgIH0KIAogICAgIHJldHVybiBbdmlkZW9UcmFj a3Mgb2JqZWN0QXRJbmRleDpmaXJzdEVuYWJsZWRJbmRleF07CiB9CkBAIC0zNjUsOCArMzgxLDEw IEBAIHZvaWQgSW1hZ2VEZWNvZGVyQVZGT2JqQzo6cmVhZFRyYWNrTWV0YWRhdGEoKQogYm9vbCBJ bWFnZURlY29kZXJBVkZPYmpDOjpzdG9yZVNhbXBsZUJ1ZmZlcihDTVNhbXBsZUJ1ZmZlclJlZiBz YW1wbGVCdWZmZXIpCiB7CiAgICAgYXV0byBwaXhlbEJ1ZmZlciA9IG1fZGVjb21wcmVzc2lvblNl c3Npb24tPmRlY29kZVNhbXBsZVN5bmMoc2FtcGxlQnVmZmVyKTsKLSAgICBpZiAoIXBpeGVsQnVm ZmVyKQorICAgIGlmICghcGl4ZWxCdWZmZXIpIHsKKyAgICAgICAgTE9HKEltYWdlcywgIkltYWdl RGVjb2RlckFWRk9iakM6OnN0b3JlU2FtcGxlQnVmZmVyKCVwKSAtIGNvdWxkIG5vdCBkZWNvZGUg c2FtcGxlQnVmZmVyIiwgdGhpcyk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAKICAg ICBhdXRvIHByZXNlbnRhdGlvblRpbWUgPSBQQUw6OnRvTWVkaWFUaW1lKENNU2FtcGxlQnVmZmVy R2V0UHJlc2VudGF0aW9uVGltZVN0YW1wKHNhbXBsZUJ1ZmZlcikpOwogICAgIGF1dG8gaW5kZXhJ dGVyID0gbV9wcmVzZW50YXRpb25UaW1lVG9JbmRleC5maW5kKHByZXNlbnRhdGlvblRpbWUpOwpA QCAtNDA1LDEyICs0MjMsMTUgQEAgYm9vbCBJbWFnZURlY29kZXJBVkZPYmpDOjpzdG9yZVNhbXBs ZUJ1ZmZlcihDTVNhbXBsZUJ1ZmZlclJlZiBzYW1wbGVCdWZmZXIpCiAgICAgfQogCiAgICAgQ0dJ bWFnZVJlZiByYXdJbWFnZSA9IG51bGxwdHI7Ci0gICAgaWYgKG5vRXJyICE9IFZUQ3JlYXRlQ0dJ bWFnZUZyb21DVlBpeGVsQnVmZmVyKHBpeGVsQnVmZmVyLmdldCgpLCBudWxscHRyLCAmcmF3SW1h Z2UpKQorICAgIGlmIChub0VyciAhPSBWVENyZWF0ZUNHSW1hZ2VGcm9tQ1ZQaXhlbEJ1ZmZlcihw aXhlbEJ1ZmZlci5nZXQoKSwgbnVsbHB0ciwgJnJhd0ltYWdlKSkgeworICAgICAgICBMT0coSW1h Z2VzLCAiSW1hZ2VEZWNvZGVyQVZGT2JqQzo6c3RvcmVTYW1wbGVCdWZmZXIoJXApIC0gY291bGQg bm90IGNyZWF0ZSBDR0ltYWdlIGZyb20gcGl4ZWxCdWZmZXIiLCB0aGlzKTsKICAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgIH0KIAogICAgIEFTU0VSVChpbmRleEl0ZXItPnNlY29uZCA8IG1fc2Ft cGxlRGF0YS5zaXplKCkpOwogICAgIGF1dG8mIHNhbXBsZURhdGEgPSBtX3NhbXBsZURhdGFbaW5k ZXhJdGVyLT5zZWNvbmRdOwogICAgIHNhbXBsZURhdGEuaW1hZ2UgPSBhZG9wdENGKHJhd0ltYWdl KTsKKyAgICBzYW1wbGVEYXRhLnNhbXBsZSA9IG51bGxwdHI7CiAKICAgICBhdXRvIGFscGhhSW5m byA9IENHSW1hZ2VHZXRBbHBoYUluZm8ocmF3SW1hZ2UpOwogICAgIHNhbXBsZURhdGEuaGFzQWxw aGEgPSAoYWxwaGFJbmZvICE9IGtDR0ltYWdlQWxwaGFOb25lICYmIGFscGhhSW5mbyAhPSBrQ0dJ bWFnZUFscGhhTm9uZVNraXBMYXN0ICYmIGFscGhhSW5mbyAhPSBrQ0dJbWFnZUFscGhhTm9uZVNr aXBGaXJzdCk7CkBAIC01NzUsNiArNTk2LDExIEBAIE5hdGl2ZUltYWdlUHRyIEltYWdlRGVjb2Rl ckFWRk9iakM6OmNyZWF0ZUZyYW1lSW1hZ2VBdEluZGV4KHNpemVfdCBpbmRleCwgU3Vic2FtCiAK ICAgICAgICAgYXV0byYgY3Vyc29yU2FtcGxlRGF0YSA9IG1fc2FtcGxlRGF0YVtpbmRleEl0ZXIt PnNlY29uZF07CiAKKyAgICAgICAgaWYgKCFjdXJzb3JTYW1wbGVEYXRhLnNhbXBsZSkgeworICAg ICAgICAgICAgYXV0byByZXF1ZXN0ID0gYWRvcHROUyhbYWxsb2NBVlNhbXBsZUJ1ZmZlclJlcXVl c3RJbnN0YW5jZSgpIGluaXRXaXRoU3RhcnRDdXJzb3I6ZnJhbWVDdXJzb3JdKTsKKyAgICAgICAg ICAgIGN1cnNvclNhbXBsZURhdGEuc2FtcGxlID0gYWRvcHRDRihbbV9nZW5lcmF0b3IgY3JlYXRl U2FtcGxlQnVmZmVyRm9yUmVxdWVzdDpyZXF1ZXN0LmdldCgpXSk7CisgICAgICAgIH0KKwogICAg ICAgICBpZiAoIWN1cnNvclNhbXBsZURhdGEuc2FtcGxlKQogICAgICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAKQEAgLTU5MSwxMCArNjE3LDcgQEAgTmF0aXZlSW1hZ2VQdHIgSW1hZ2VEZWNvZGVy QVZGT2JqQzo6Y3JlYXRlRnJhbWVJbWFnZUF0SW5kZXgoc2l6ZV90IGluZGV4LCBTdWJzYW0KIAog dm9pZCBJbWFnZURlY29kZXJBVkZPYmpDOjpzZXRFeHBlY3RlZENvbnRlbnRTaXplKGxvbmcgbG9u ZyBleHBlY3RlZENvbnRlbnRTaXplKQogewotICAgIGlmIChtX2V4cGVjdGVkQ29udGVudFNpemUg PT0gZXhwZWN0ZWRDb250ZW50U2l6ZSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9sb2FkZXIu Z2V0KCkuZXhwZWN0ZWRDb250ZW50U2l6ZSA9IG1fZXhwZWN0ZWRDb250ZW50U2l6ZTsKKyAgICBt X2xvYWRlci5nZXQoKS5leHBlY3RlZENvbnRlbnRTaXplID0gZXhwZWN0ZWRDb250ZW50U2l6ZTsK IH0KIAogdm9pZCBJbWFnZURlY29kZXJBVkZPYmpDOjpzZXREYXRhKFNoYXJlZEJ1ZmZlciYgZGF0 YSwgYm9vbCBhbGxEYXRhUmVjZWl2ZWQpCg== 323957 2017-10-16 16:55:08 -0700 2017-10-16 17:35:15 -0700 Patch for landing bug-178360-20171016165507.patch text/plain 9467 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzNDQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTFlZDI1MDdlY2M1ZTJm YTZmMWNmMGU3ODJiNjU5ZDkyMTFmY2Y4Ny4uNThmZTYwMDY5YWVhMDE3YjU3YWYxODUwMDdjZTEw MmMzZTk0ZjgxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE3LTEwLTE2ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIEltYWdlRGVjb2RlckFWRk9i akMgZmFpbHMgdG8gY3JlYXRlIG1vcmUgQ01TYW1wbGVCdWZmZXJzIGFmdGVyIGNyZWF0aW5nIGFi b3V0IDMyTUIgd29ydGguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzgzNjAKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAg ICAgICAgQVZTYW1wbGVCdWZmZXJHZW5lcmF0b3IgaGFzIGEgY29uc3RyYWluZWQgbWVtb3J5IHBv b2wgb2YgYWJvdXQgMzJNQiBpbiBzaXplLiBPbmNlCisgICAgICAgIENNU2FtcGxlQnVmZmVycyBy ZXByZXNlbnRpbmcgYWJvdXQgMzJNQiBvZiBtZW1vcnkgYXJlIGFsbG9jYXRlZCwgbm8gbW9yZSBj YW4gYmUgY3JlYXRlZAorICAgICAgICB1bnRpbCBwcmV2aW91c2x5IGNyZWF0ZWQgb25lcyBhcmUg cmVsZWFzZWQuIFNvIHJhdGhlciB0aGFuIChvbmx5KSBjcmVhdGluZyB0aGUgc2FtcGxlCisgICAg ICAgIGJ1ZmZlcnMgdXAgZnJvbnQgaW4gcmVhZFNhbXBsZU1ldGFkYXRhKCksIGFsc28gY3JlYXRl IHRoZW0gZHluYW1pY2FsbHksIGlmIG1pc3NpbmcsIGluCisgICAgICAgIGNyZWF0ZUZyYW1lSW1h Z2VBdEluZGV4KC4uLikgYW5kIHJlbGVhc2UgdGhlbSBpbiBzdG9yZVNhbXBsZUJ1ZmZlciguLi4p IGFmdGVyIHRoZXkgaGF2ZSBiZWVuCisgICAgICAgIGRlY29kZWQuCisKKyAgICAgICAgRHJpdmUt YnkgZml4OiB0aGUgZXhwZWN0ZWQgY29udGVudCBsZW5ndGggd2FzIG5ldmVyIGFjdHVhbGx5IHNl dCBieSB0aGUgb3duZXIgb2YgSW1hZ2VEZWNvZGVyQVZGT2JqQy4KKyAgICAgICAgTm93IHRoYXQg dGhlIGV4cGVjdGVkIGNvbnRlbnQgbGVuZ3RoIGlzIGF2YWlsYWJsZSwgd2UgZG9uJ3QgaGF2ZSB0 byB3YWl0IHVudGlsIHRoZSBkYXRhIGlzIGNvbXBsZXRlCisgICAgICAgIHRvIHJlc3BvbmQgdG8g cmVxdWVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9JbWFnZVNvdXJjZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbWFnZVNvdXJjZTo6ZW5zdXJlRGVjb2RlckF2YWlsYWJsZSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvSW1hZ2VEZWNv ZGVyQVZGT2JqQy5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL0ltYWdlRGVjb2RlckFWRk9iakMubW06CisgICAgICAgIChTT0ZUX0xJTktfUE9JTlRFUl9P UFRJT05BTCk6CisgICAgICAgICgtW1dlYkNvcmVTaGFyZWRCdWZmZXJSZXNvdXJjZUxvYWRlckRl bGVnYXRlIGNhbkZ1bGZpbGxSZXF1ZXN0Ol0pOgorICAgICAgICAoLVtXZWJDb3JlU2hhcmVkQnVm ZmVyUmVzb3VyY2VMb2FkZXJEZWxlZ2F0ZSBmdWxmaWxsUmVxdWVzdDpdKToKKyAgICAgICAgKC1b V2ViQ29yZVNoYXJlZEJ1ZmZlclJlc291cmNlTG9hZGVyRGVsZWdhdGUgcmVzb3VyY2VMb2FkZXI6 c2hvdWxkV2FpdEZvckxvYWRpbmdPZlJlcXVlc3RlZFJlc291cmNlOl0pOgorICAgICAgICAoV2Vi Q29yZTo6aW1hZ2VEZWNvZGVyQXNzZXRPcHRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl RGVjb2RlckFWRk9iakM6OmZpcnN0RW5hYmxlZFRyYWNrKToKKyAgICAgICAgKFdlYkNvcmU6Oklt YWdlRGVjb2RlckFWRk9iakM6OnN0b3JlU2FtcGxlQnVmZmVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkltYWdlRGVjb2RlckFWRk9iakM6OmNyZWF0ZUZyYW1lSW1hZ2VBdEluZGV4KToKKyAgICAgICAg KFdlYkNvcmU6OkltYWdlRGVjb2RlckFWRk9iakM6OnNldEV4cGVjdGVkQ29udGVudFNpemUpOgor CiAyMDE3LTEwLTEzICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAg IFBlcmZvcm1hbmNlOiBTa2lwIHRleHR1cmUgdXBsb2FkIGlmIHNvdXJjZSBpbWFnZSBhbmQgZGVz dGluYXRpb24gdGV4dHVyZSBoYXZlbid0IGNoYW5nZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlU291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ltYWdlU291cmNlLmNwcAppbmRleCAwYzk1ZTQ4MmFlNmNjNTA0Mjg2 ODE5ZmNmY2E1NmIyMDY3YTMyNjA5Li5iOTc2OThlYjI0YWM3N2NiM2Q4NzVhOWY4YmYyYzY3YzAy NTMzZjY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFn ZVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VT b3VyY2UuY3BwCkBAIC03OSw2ICs3OSw5IEBAIGJvb2wgSW1hZ2VTb3VyY2U6OmVuc3VyZURlY29k ZXJBdmFpbGFibGUoU2hhcmVkQnVmZmVyKiBkYXRhKQogICAgIGlmICghaXNEZWNvZGVyQXZhaWxh YmxlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIGlmIChhdXRvIGV4cGVjdGVkQ29u dGVudExlbmd0aCA9IG1fZnJhbWVDYWNoZS0+ZXhwZWN0ZWRDb250ZW50TGVuZ3RoKCkpCisgICAg ICAgIG1fZGVjb2Rlci0+c2V0RXhwZWN0ZWRDb250ZW50U2l6ZShleHBlY3RlZENvbnRlbnRMZW5n dGgpOworCiAgICAgbV9mcmFtZUNhY2hlLT5zZXREZWNvZGVyKG1fZGVjb2Rlci5nZXQoKSk7CiAg ICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9JbWFnZURlY29kZXJBVkZPYmpDLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9JbWFnZURlY29kZXJB VkZPYmpDLmgKaW5kZXggNmZhZTIxODNjODUyODlkZThkYWRiYzdjMWFlMmE2OWM1ODA4YzA4Ni4u YmExMTU2MmIyNjk4Y2NiYWNjMGU4YjQ5OTczMjZlYWI3YmMwMmQyNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvSW1hZ2VEZWNv ZGVyQVZGT2JqQy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL0ltYWdlRGVjb2RlckFWRk9iakMuaApAQCAtMTE5LDcgKzExOSw2IEBAIHBy aXZhdGU6CiAgICAgVmVjdG9yPFNhbXBsZURhdGE+IG1fc2FtcGxlRGF0YTsKICAgICBMb2NrIG1f c2FtcGxlR2VuZXJhdG9yTG9jazsKICAgICBib29sIG1faXNBbGxEYXRhUmVjZWl2ZWQgeyBmYWxz ZSB9OwotICAgIGxvbmcgbG9uZyBtX2V4cGVjdGVkQ29udGVudFNpemUgeyAwIH07CiAgICAgc3Rk OjpvcHRpb25hbDxJbnRTaXplPiBtX3NpemU7CiAgICAgc3RkOjpvcHRpb25hbDxSb3RhdGlvblBy b3BlcnRpZXM+IG1fcm90YXRpb247CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvSW1hZ2VEZWNvZGVyQVZGT2JqQy5tbSBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL0ltYWdl RGVjb2RlckFWRk9iakMubW0KaW5kZXggNWZkZGI4NTIxMmZiOGI3ZWQwZjViYWUwOGQzMWMyYWVk ZmM2YWJlNi4uNGZiYjdiYWNiNmJlZDhlYjJmNTUyMzc0YzE4MTdlMDEyOGRjYjAwZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv SW1hZ2VEZWNvZGVyQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9hdmZvdW5kYXRpb24vb2JqYy9JbWFnZURlY29kZXJBVkZPYmpDLm1tCkBAIC0zMiw2ICsz Miw3IEBACiAjaW1wb3J0ICJGbG9hdFF1YWQuaCIKICNpbXBvcnQgIkZsb2F0UmVjdC5oIgogI2lt cG9ydCAiRmxvYXRTaXplLmgiCisjaW1wb3J0ICJMb2dnaW5nLmgiCiAjaW1wb3J0ICJNSU1FVHlw ZVJlZ2lzdHJ5LmgiCiAjaW1wb3J0ICJTaGFyZWRCdWZmZXIuaCIKICNpbXBvcnQgIlVUSVV0aWxp dGllcy5oIgpAQCAtNjMsOCArNjQsMTAgQEAgU09GVF9MSU5LX0NMQVNTX09QVElPTkFMKEFWRm91 bmRhdGlvbiwgQVZTYW1wbGVCdWZmZXJHZW5lcmF0b3IpCiBTT0ZUX0xJTktfQ0xBU1NfT1BUSU9O QUwoQVZGb3VuZGF0aW9uLCBBVlNhbXBsZUJ1ZmZlclJlcXVlc3QpCiBTT0ZUX0xJTktfUE9JTlRF Ul9PUFRJT05BTChBVkZvdW5kYXRpb24sIEFWTWVkaWFDaGFyYWN0ZXJpc3RpY1Zpc3VhbCwgTlNT dHJpbmcgKikKIFNPRlRfTElOS19QT0lOVEVSX09QVElPTkFMKEFWRm91bmRhdGlvbiwgQVZVUkxB c3NldFJlZmVyZW5jZVJlc3RyaWN0aW9uc0tleSwgTlNTdHJpbmcgKikKK1NPRlRfTElOS19QT0lO VEVSX09QVElPTkFMKEFWRm91bmRhdGlvbiwgQVZVUkxBc3NldFVzZXNOb1BlcnNpc3RlbnRDYWNo ZUtleSwgTlNTdHJpbmcgKikKICNkZWZpbmUgQVZNZWRpYUNoYXJhY3RlcmlzdGljVmlzdWFsIGdl dEFWTWVkaWFDaGFyYWN0ZXJpc3RpY1Zpc3VhbCgpCiAjZGVmaW5lIEFWVVJMQXNzZXRSZWZlcmVu Y2VSZXN0cmljdGlvbnNLZXkgZ2V0QVZVUkxBc3NldFJlZmVyZW5jZVJlc3RyaWN0aW9uc0tleSgp CisjZGVmaW5lIEFWVVJMQXNzZXRVc2VzTm9QZXJzaXN0ZW50Q2FjaGVLZXkgZ2V0QVZVUkxBc3Nl dFVzZXNOb1BlcnNpc3RlbnRDYWNoZUtleSgpCiAKICNwcmFnbWEgbWFyayAtCiAKQEAgLTEyNyw3 ICsxMzAsNyBAQCAtIChCT09MKWNhbkZ1bGZpbGxSZXF1ZXN0OihBVkFzc2V0UmVzb3VyY2VMb2Fk aW5nUmVxdWVzdCAqKXJlcXVlc3QKICAgICAgICAgcmV0dXJuIE5POwogCiAgICAgaWYgKGF1dG8g ZGF0YVJlcXVlc3QgPSByZXF1ZXN0LmRhdGFSZXF1ZXN0KSB7Ci0gICAgICAgIGlmIChkYXRhUmVx dWVzdC5yZXF1ZXN0ZWRPZmZzZXQgKyBkYXRhUmVxdWVzdC5yZXF1ZXN0ZWRMZW5ndGggPiBzdGF0 aWNfY2FzdDxsb25nIGxvbmc+KF9kYXRhLmdldCgpLmxlbmd0aCkpCisgICAgICAgIGlmIChkYXRh UmVxdWVzdC5yZXF1ZXN0ZWRPZmZzZXQgPiBzdGF0aWNfY2FzdDxsb25nIGxvbmc+KF9kYXRhLmdl dCgpLmxlbmd0aCkpCiAgICAgICAgICAgICByZXR1cm4gTk87CiAgICAgfQogCkBAIC0xNzcsNiAr MTgwLDEyIEBAIC0gKHZvaWQpZnVsZmlsbFJlcXVlc3Q6KEFWQXNzZXRSZXNvdXJjZUxvYWRpbmdS ZXF1ZXN0ICopcmVxdWVzdAogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIFtkYXRhUmVx dWVzdCByZXNwb25kV2l0aERhdGE6cmVxdWVzdGVkRGF0YV07CisKKyAgICAgICAgaWYgKGRhdGFS ZXF1ZXN0LnJlcXVlc3RzQWxsRGF0YVRvRW5kT2ZSZXNvdXJjZSkgeworICAgICAgICAgICAgaWYg KCFfY29tcGxldGUpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9IGVsc2UgaWYg KGRhdGFSZXF1ZXN0LnJlcXVlc3RlZE9mZnNldCArIGRhdGFSZXF1ZXN0LnJlcXVlc3RlZExlbmd0 aCA+IGRhdGFSZXF1ZXN0LmN1cnJlbnRPZmZzZXQpCisgICAgICAgICAgICByZXR1cm47CiAgICAg fQogCiAgICAgW3JlcXVlc3QgZmluaXNoTG9hZGluZ107CkBAIC0xOTAsNyArMTk5LDggQEAgLSAo Qk9PTClyZXNvdXJjZUxvYWRlcjooQVZBc3NldFJlc291cmNlTG9hZGVyICopcmVzb3VyY2VMb2Fk ZXIgc2hvdWxkV2FpdEZvckxvYWQKIAogICAgIGlmIChbc2VsZiBjYW5GdWxmaWxsUmVxdWVzdDps b2FkaW5nUmVxdWVzdF0pIHsKICAgICAgICAgW3NlbGYgZnVsZmlsbFJlcXVlc3Q6bG9hZGluZ1Jl cXVlc3RdOwotICAgICAgICByZXR1cm4gTk87CisgICAgICAgIGlmIChsb2FkaW5nUmVxdWVzdC5m aW5pc2hlZCkKKyAgICAgICAgICAgIHJldHVybiBOTzsKICAgICB9CiAKICAgICBbc2VsZiBlbnF1 ZXVlUmVxdWVzdDpsb2FkaW5nUmVxdWVzdF07CkBAIC0yMjIsOCArMjMyLDEyIEBAIHN0YXRpYyBO U1VSTCAqY3VzdG9tU2NoZW1lVVJMKCkKIHN0YXRpYyBOU0RpY3Rpb25hcnkgKmltYWdlRGVjb2Rl ckFzc2V0T3B0aW9ucygpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFJldGFpblB0cjxO U0RpY3Rpb25hcnk+PiBvcHRpb25zOwotICAgIGlmICghb3B0aW9ucy5nZXQoKSkKLSAgICAgICAg b3B0aW9ucy5nZXQoKSA9IEB7IEFWVVJMQXNzZXRSZWZlcmVuY2VSZXN0cmljdGlvbnNLZXk6IEAo QVZBc3NldFJlZmVyZW5jZVJlc3RyaWN0aW9uRm9yYmlkQWxsKSB9OworICAgIGlmICghb3B0aW9u cy5nZXQoKSkgeworICAgICAgICBvcHRpb25zLmdldCgpID0gQHsKKyAgICAgICAgICAgIEFWVVJM QXNzZXRSZWZlcmVuY2VSZXN0cmljdGlvbnNLZXk6IEAoQVZBc3NldFJlZmVyZW5jZVJlc3RyaWN0 aW9uRm9yYmlkQWxsKSwKKyAgICAgICAgICAgIEFWVVJMQXNzZXRVc2VzTm9QZXJzaXN0ZW50Q2Fj aGVLZXk6IEBZRVMsCisgICAgICAgIH07CisgICAgfQogCiAgICAgcmV0dXJuIG9wdGlvbnMuZ2V0 KCkuZ2V0KCk7CiB9CkBAIC0zMDcsOCArMzIxLDEwIEBAIEFWQXNzZXRUcmFjayAqSW1hZ2VEZWNv ZGVyQVZGT2JqQzo6Zmlyc3RFbmFibGVkVHJhY2soKQogICAgICAgICByZXR1cm4gdHJhY2suZW5h YmxlZDsKICAgICB9XTsKIAotICAgIGlmIChmaXJzdEVuYWJsZWRJbmRleCA9PSBOU05vdEZvdW5k KQorICAgIGlmIChmaXJzdEVuYWJsZWRJbmRleCA9PSBOU05vdEZvdW5kKSB7CisgICAgICAgIExP RyhJbWFnZXMsICJJbWFnZURlY29kZXJBVkZPYmpDOjpmaXJzdEVuYWJsZWRUcmFjayglcCkgLSBh c3NldCBoYXMgbm8gZW5hYmxlZCB2aWRlbyB0cmFja3MiLCB0aGlzKTsKICAgICAgICAgcmV0dXJu IG5pbDsKKyAgICB9CiAKICAgICByZXR1cm4gW3ZpZGVvVHJhY2tzIG9iamVjdEF0SW5kZXg6Zmly c3RFbmFibGVkSW5kZXhdOwogfQpAQCAtMzY1LDggKzM4MSwxMCBAQCB2b2lkIEltYWdlRGVjb2Rl ckFWRk9iakM6OnJlYWRUcmFja01ldGFkYXRhKCkKIGJvb2wgSW1hZ2VEZWNvZGVyQVZGT2JqQzo6 c3RvcmVTYW1wbGVCdWZmZXIoQ01TYW1wbGVCdWZmZXJSZWYgc2FtcGxlQnVmZmVyKQogewogICAg IGF1dG8gcGl4ZWxCdWZmZXIgPSBtX2RlY29tcHJlc3Npb25TZXNzaW9uLT5kZWNvZGVTYW1wbGVT eW5jKHNhbXBsZUJ1ZmZlcik7Ci0gICAgaWYgKCFwaXhlbEJ1ZmZlcikKKyAgICBpZiAoIXBpeGVs QnVmZmVyKSB7CisgICAgICAgIExPRyhJbWFnZXMsICJJbWFnZURlY29kZXJBVkZPYmpDOjpzdG9y ZVNhbXBsZUJ1ZmZlciglcCkgLSBjb3VsZCBub3QgZGVjb2RlIHNhbXBsZUJ1ZmZlciIsIHRoaXMp OwogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogCiAgICAgYXV0byBwcmVzZW50YXRpb25U aW1lID0gUEFMOjp0b01lZGlhVGltZShDTVNhbXBsZUJ1ZmZlckdldFByZXNlbnRhdGlvblRpbWVT dGFtcChzYW1wbGVCdWZmZXIpKTsKICAgICBhdXRvIGluZGV4SXRlciA9IG1fcHJlc2VudGF0aW9u VGltZVRvSW5kZXguZmluZChwcmVzZW50YXRpb25UaW1lKTsKQEAgLTQwNSwxMiArNDIzLDE1IEBA IGJvb2wgSW1hZ2VEZWNvZGVyQVZGT2JqQzo6c3RvcmVTYW1wbGVCdWZmZXIoQ01TYW1wbGVCdWZm ZXJSZWYgc2FtcGxlQnVmZmVyKQogICAgIH0KIAogICAgIENHSW1hZ2VSZWYgcmF3SW1hZ2UgPSBu dWxscHRyOwotICAgIGlmIChub0VyciAhPSBWVENyZWF0ZUNHSW1hZ2VGcm9tQ1ZQaXhlbEJ1ZmZl cihwaXhlbEJ1ZmZlci5nZXQoKSwgbnVsbHB0ciwgJnJhd0ltYWdlKSkKKyAgICBpZiAobm9FcnIg IT0gVlRDcmVhdGVDR0ltYWdlRnJvbUNWUGl4ZWxCdWZmZXIocGl4ZWxCdWZmZXIuZ2V0KCksIG51 bGxwdHIsICZyYXdJbWFnZSkpIHsKKyAgICAgICAgTE9HKEltYWdlcywgIkltYWdlRGVjb2RlckFW Rk9iakM6OnN0b3JlU2FtcGxlQnVmZmVyKCVwKSAtIGNvdWxkIG5vdCBjcmVhdGUgQ0dJbWFnZSBm cm9tIHBpeGVsQnVmZmVyIiwgdGhpcyk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CiAK ICAgICBBU1NFUlQoaW5kZXhJdGVyLT5zZWNvbmQgPCBtX3NhbXBsZURhdGEuc2l6ZSgpKTsKICAg ICBhdXRvJiBzYW1wbGVEYXRhID0gbV9zYW1wbGVEYXRhW2luZGV4SXRlci0+c2Vjb25kXTsKICAg ICBzYW1wbGVEYXRhLmltYWdlID0gYWRvcHRDRihyYXdJbWFnZSk7CisgICAgc2FtcGxlRGF0YS5z YW1wbGUgPSBudWxscHRyOwogCiAgICAgYXV0byBhbHBoYUluZm8gPSBDR0ltYWdlR2V0QWxwaGFJ bmZvKHJhd0ltYWdlKTsKICAgICBzYW1wbGVEYXRhLmhhc0FscGhhID0gKGFscGhhSW5mbyAhPSBr Q0dJbWFnZUFscGhhTm9uZSAmJiBhbHBoYUluZm8gIT0ga0NHSW1hZ2VBbHBoYU5vbmVTa2lwTGFz dCAmJiBhbHBoYUluZm8gIT0ga0NHSW1hZ2VBbHBoYU5vbmVTa2lwRmlyc3QpOwpAQCAtNTc1LDYg KzU5NiwxMSBAQCBOYXRpdmVJbWFnZVB0ciBJbWFnZURlY29kZXJBVkZPYmpDOjpjcmVhdGVGcmFt ZUltYWdlQXRJbmRleChzaXplX3QgaW5kZXgsIFN1YnNhbQogCiAgICAgICAgIGF1dG8mIGN1cnNv clNhbXBsZURhdGEgPSBtX3NhbXBsZURhdGFbaW5kZXhJdGVyLT5zZWNvbmRdOwogCisgICAgICAg IGlmICghY3Vyc29yU2FtcGxlRGF0YS5zYW1wbGUpIHsKKyAgICAgICAgICAgIGF1dG8gcmVxdWVz dCA9IGFkb3B0TlMoW2FsbG9jQVZTYW1wbGVCdWZmZXJSZXF1ZXN0SW5zdGFuY2UoKSBpbml0V2l0 aFN0YXJ0Q3Vyc29yOmZyYW1lQ3Vyc29yXSk7CisgICAgICAgICAgICBjdXJzb3JTYW1wbGVEYXRh LnNhbXBsZSA9IGFkb3B0Q0YoW21fZ2VuZXJhdG9yIGNyZWF0ZVNhbXBsZUJ1ZmZlckZvclJlcXVl c3Q6cmVxdWVzdC5nZXQoKV0pOworICAgICAgICB9CisKICAgICAgICAgaWYgKCFjdXJzb3JTYW1w bGVEYXRhLnNhbXBsZSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogCkBAIC01OTEsMTAg KzYxNyw3IEBAIE5hdGl2ZUltYWdlUHRyIEltYWdlRGVjb2RlckFWRk9iakM6OmNyZWF0ZUZyYW1l SW1hZ2VBdEluZGV4KHNpemVfdCBpbmRleCwgU3Vic2FtCiAKIHZvaWQgSW1hZ2VEZWNvZGVyQVZG T2JqQzo6c2V0RXhwZWN0ZWRDb250ZW50U2l6ZShsb25nIGxvbmcgZXhwZWN0ZWRDb250ZW50U2l6 ZSkKIHsKLSAgICBpZiAobV9leHBlY3RlZENvbnRlbnRTaXplID09IGV4cGVjdGVkQ29udGVudFNp emUpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1fbG9hZGVyLmdldCgpLmV4cGVjdGVkQ29udGVu dFNpemUgPSBtX2V4cGVjdGVkQ29udGVudFNpemU7CisgICAgbV9sb2FkZXIuZ2V0KCkuZXhwZWN0 ZWRDb250ZW50U2l6ZSA9IGV4cGVjdGVkQ29udGVudFNpemU7CiB9CiAKIHZvaWQgSW1hZ2VEZWNv ZGVyQVZGT2JqQzo6c2V0RGF0YShTaGFyZWRCdWZmZXImIGRhdGEsIGJvb2wgYWxsRGF0YVJlY2Vp dmVkKQo=