206706 2020-01-23 15:34:42 -0800 Get rid of didFinishParsing and make parseInner return its results 2020-01-24 11:12:16 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 197106 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov guijemont keith_miller mark.lam msaboff rmorisset ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1610360 0 saam 2020-01-23 15:34:42 -0800 Cleans up some code and makes parseInner less stateful. This should make it easier to eagerly parse IIFE 1610431 1 388626 saam 2020-01-23 17:26:43 -0800 Created attachment 388626 patch 1610433 2 388626 mark.lam 2020-01-23 17:31:08 -0800 Comment on attachment 388626 patch r=me 1610434 3 388626 keith_miller 2020-01-23 17:31:19 -0800 Comment on attachment 388626 patch r=me. 1610435 4 388626 ysuzuki 2020-01-23 17:31:24 -0800 Comment on attachment 388626 patch r=me too, nice. didFinishParsing looks ugly. 1610461 5 388632 saam 2020-01-23 18:09:48 -0800 Created attachment 388632 patch for landing 1610476 6 388632 commit-queue 2020-01-23 18:54:42 -0800 Comment on attachment 388632 patch for landing Clearing flags on attachment: 388632 Committed r255047: <https://trac.webkit.org/changeset/255047> 1610477 7 commit-queue 2020-01-23 18:54:44 -0800 All reviewed patches have been landed. Closing bug. 1610478 8 webkit-bug-importer 2020-01-23 18:55:14 -0800 <rdar://problem/58857211> 1610523 9 ysuzuki 2020-01-23 21:42:01 -0800 Committed r255053: <https://trac.webkit.org/changeset/255053> 1610770 10 saam 2020-01-24 11:12:16 -0800 (In reply to Yusuke Suzuki from comment #9) > Committed r255053: <https://trac.webkit.org/changeset/255053> oops. Thanks for fixing 388626 2020-01-23 17:26:43 -0800 2020-01-23 18:09:48 -0800 patch a-backup.diff text/plain 11203 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjU1MDQzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDIwLTAxLTIzICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEdldCByaWQgb2YgZGlkRmluaXNoUGFyc2luZyBhbmQgbWFrZSBwYXJzZUlubmVyIHJldHVybiBp dHMgcmVzdWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjA2NzA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBpcyBwYXZpbmcgdGhlIHdheSBmb3IgZWFnZXJseSBwYXJzaW5nIGltbWVkaWF0ZWx5 IGludm9rZWQgZnVuY3Rpb25zLgorICAgICAgICBCZWZvcmUsIHdlJ2QganVzdCBlbmQgdXAgc2V0 dGluZyBtZW1iZXIgZmllbGRzIGluc2lkZSA6OmRpZEZpbmlzaFBhcnNpbmcsCisgICAgICAgIGFu ZCB0aGVuIHJlYWQgdGhlbSBvdXQgaW5zaWRlIDo6cGFyc2UuIEhvd2V2ZXIsIHRoaXMgaXMgbm90 IGdvaW5nIHRvIHdvcmsKKyAgICAgICAgd2hlbiB3ZSBhcmUgaW4gYSB3b3JsZCB3aGVyZSB3ZSdy ZSBnZW5lcmF0aW5nIEFTVCBub2RlcyBmb3IgbW9yZSB0aGFuIG9uZQorICAgICAgICBmdW5jdGlv biBhdCBhIHRpbWUuIFRoaXMgcGF0Y2ggcGF2ZXMgdGhlIHdheSBmb3IgdGhhdC4KKworICAgICAg ICAqIHBhcnNlci9QYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6 UGFyc2VyKToKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlSW5uZXIpOgor ICAgICAgICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBlPjo6ZGlkRmluaXNoUGFyc2luZyk6IERlbGV0 ZWQuCisgICAgICAgICogcGFyc2VyL1BhcnNlci5oOgorICAgICAgICAoSlNDOjpQYXJzZXI8TGV4 ZXJUeXBlPjo6cGFyc2UpOgorCiAyMDIwLTAxLTIzICBSb2JpbiBNb3Jpc3NldCAgPHJtb3Jpc3Nl dEBhcHBsZS5jb20+CiAKICAgICAgICAgRG9uJ3QgaW5jbHVkZSBCeXRlY29kZVN0cnVjdHMuaCBp biBDb21tb25TbG93UGF0aHMuaApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Q YXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFy c2VyLmNwcAkocmV2aXNpb24gMjU1MDQwKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNl ci9QYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzIsNyArMTMyLDYgQEAgUGFyc2VyPExl eGVyVHlwZT46OlBhcnNlcihWTSYgdm0sIGNvbnN0IAogICAgICwgbV9oYXNTdGFja092ZXJmbG93 KGZhbHNlKQogICAgICwgbV9hbGxvd3NJbih0cnVlKQogICAgICwgbV9zdGF0ZW1lbnREZXB0aCgw KQotICAgICwgbV9zb3VyY2VFbGVtZW50cygwKQogICAgICwgbV9wYXJzaW5nQnVpbHRpbihidWls dGluTW9kZSA9PSBKU1BhcnNlckJ1aWx0aW5Nb2RlOjpCdWlsdGluKQogICAgICwgbV9zY3JpcHRN b2RlKHNjcmlwdE1vZGUpCiAgICAgLCBtX3N1cGVyQmluZGluZyhzdXBlckJpbmRpbmcpCkBAIC0y MDgsMjQgKzIwNywyMyBAQCBQYXJzZXI8TGV4ZXJUeXBlPjo6flBhcnNlcigpCiB9CiAKIHRlbXBs YXRlIDx0eXBlbmFtZSBMZXhlclR5cGU+Ci1TdHJpbmcgUGFyc2VyPExleGVyVHlwZT46OnBhcnNl SW5uZXIoY29uc3QgSWRlbnRpZmllciYgY2FsbGVlTmFtZSwgU291cmNlUGFyc2VNb2RlIHBhcnNl TW9kZSwgUGFyc2luZ0NvbnRleHQgcGFyc2luZ0NvbnRleHQsIE9wdGlvbmFsPGludD4gZnVuY3Rp b25Db25zdHJ1Y3RvclBhcmFtZXRlcnNFbmRQb3NpdGlvbiwgY29uc3QgVmVjdG9yPEpTVGV4dFBv c2l0aW9uPiogaW5zdGFuY2VGaWVsZExvY2F0aW9ucykKK0V4cGVjdGVkPHR5cGVuYW1lIFBhcnNl cjxMZXhlclR5cGU+OjpQYXJzZUlubmVyUmVzdWx0LCBTdHJpbmc+IFBhcnNlcjxMZXhlclR5cGU+ OjpwYXJzZUlubmVyKGNvbnN0IElkZW50aWZpZXImIGNhbGxlZU5hbWUsIFNvdXJjZVBhcnNlTW9k ZSBwYXJzZU1vZGUsIFBhcnNpbmdDb250ZXh0IHBhcnNpbmdDb250ZXh0LCBPcHRpb25hbDxpbnQ+ IGZ1bmN0aW9uQ29uc3RydWN0b3JQYXJhbWV0ZXJzRW5kUG9zaXRpb24sIGNvbnN0IFZlY3RvcjxK U1RleHRQb3NpdGlvbj4qIGluc3RhbmNlRmllbGRMb2NhdGlvbnMpCiB7Ci0gICAgU3RyaW5nIHBh cnNlRXJyb3IgPSBTdHJpbmcoKTsKLQogICAgIEFTVEJ1aWxkZXIgY29udGV4dChjb25zdF9jYXN0 PFZNJj4obV92bSksIG1fcGFyc2VyQXJlbmEsIGNvbnN0X2Nhc3Q8U291cmNlQ29kZSo+KG1fc291 cmNlKSk7CiAgICAgU2NvcGVSZWYgc2NvcGUgPSBjdXJyZW50U2NvcGUoKTsKICAgICBzY29wZS0+ c2V0SXNMZXhpY2FsU2NvcGUoKTsKICAgICBTZXRGb3JTY29wZTxGdW5jdGlvblBhcnNlUGhhc2U+ IGZ1bmN0aW9uUGFyc2VQaGFzZVBvaXNvbmVyKG1fcGFyc2VyU3RhdGUuZnVuY3Rpb25QYXJzZVBo YXNlLCBGdW5jdGlvblBhcnNlUGhhc2U6OkJvZHkpOwogCisgICAgRnVuY3Rpb25QYXJhbWV0ZXJz KiBwYXJhbWV0ZXJzID0gbnVsbHB0cjsKICAgICBib29sIGlzQXJyb3dGdW5jdGlvbkJvZHlFeHBy ZXNzaW9uID0gcGFyc2VNb2RlID09IFNvdXJjZVBhcnNlTW9kZTo6QXN5bmNBcnJvd0Z1bmN0aW9u Qm9keU1vZGUgJiYgIW1hdGNoKE9QRU5CUkFDRSk7CiAgICAgaWYgKG1fbGV4ZXItPmlzUmVwYXJz aW5nRnVuY3Rpb24oKSkgewogICAgICAgICBQYXJzZXJGdW5jdGlvbkluZm88QVNUQnVpbGRlcj4g ZnVuY3Rpb25JbmZvOwogICAgICAgICBpZiAoaXNHZW5lcmF0b3JPckFzeW5jRnVuY3Rpb25Cb2R5 UGFyc2VNb2RlKHBhcnNlTW9kZSkpCi0gICAgICAgICAgICBtX3BhcmFtZXRlcnMgPSBjcmVhdGVH ZW5lcmF0b3JQYXJhbWV0ZXJzKGNvbnRleHQsIGZ1bmN0aW9uSW5mby5wYXJhbWV0ZXJDb3VudCk7 CisgICAgICAgICAgICBwYXJhbWV0ZXJzID0gY3JlYXRlR2VuZXJhdG9yUGFyYW1ldGVycyhjb250 ZXh0LCBmdW5jdGlvbkluZm8ucGFyYW1ldGVyQ291bnQpOwogICAgICAgICBlbHNlIGlmIChwYXJz ZU1vZGUgPT0gU291cmNlUGFyc2VNb2RlOjpJbnN0YW5jZUZpZWxkSW5pdGlhbGl6ZXJNb2RlKQot ICAgICAgICAgICAgbV9wYXJhbWV0ZXJzID0gY29udGV4dC5jcmVhdGVGb3JtYWxQYXJhbWV0ZXJM aXN0KCk7CisgICAgICAgICAgICBwYXJhbWV0ZXJzID0gY29udGV4dC5jcmVhdGVGb3JtYWxQYXJh bWV0ZXJMaXN0KCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fcGFyYW1ldGVycyA9IHBh cnNlRnVuY3Rpb25QYXJhbWV0ZXJzKGNvbnRleHQsIHBhcnNlTW9kZSwgZnVuY3Rpb25JbmZvKTsK KyAgICAgICAgICAgIHBhcmFtZXRlcnMgPSBwYXJzZUZ1bmN0aW9uUGFyYW1ldGVycyhjb250ZXh0 LCBwYXJzZU1vZGUsIGZ1bmN0aW9uSW5mbyk7CiAKICAgICAgICAgaWYgKFNvdXJjZVBhcnNlTW9k ZVNldChTb3VyY2VQYXJzZU1vZGU6OkFycm93RnVuY3Rpb25Nb2RlLCBTb3VyY2VQYXJzZU1vZGU6 OkFzeW5jQXJyb3dGdW5jdGlvbk1vZGUpLmNvbnRhaW5zKHBhcnNlTW9kZSkgJiYgIWhhc0Vycm9y KCkpIHsKICAgICAgICAgICAgIC8vIFRoZSBvbmx5IHdheSB3ZSBjb3VsZCBoYXZlIGFuIGVycm9y IHdpbGUgcmVwYXJzaW5nIGlzIGlmIHdlIHJ1biBvdXQgb2Ygc3RhY2sgc3BhY2UuCkBAIC0yNjQs MTIgKzI2Miw4IEBAIFN0cmluZyBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VJbm5lcihjb24KICAg ICB9CiAKICAgICBib29sIHZhbGlkRW5kaW5nID0gY29uc3VtZShFT0ZUT0spOwotICAgIGlmICgh c291cmNlRWxlbWVudHMgfHwgIXZhbGlkRW5kaW5nKSB7Ci0gICAgICAgIGlmIChoYXNFcnJvcigp KQotICAgICAgICAgICAgcGFyc2VFcnJvciA9IG1fZXJyb3JNZXNzYWdlOwotICAgICAgICBlbHNl Ci0gICAgICAgICAgICBwYXJzZUVycm9yID0gIlBhcnNlciBlcnJvciJfczsKLSAgICB9CisgICAg aWYgKCFzb3VyY2VFbGVtZW50cyB8fCAhdmFsaWRFbmRpbmcpCisgICAgICAgIHJldHVybiBtYWtl VW5leHBlY3RlZChoYXNFcnJvcigpID8gbV9lcnJvck1lc3NhZ2UgOiAiUGFyc2VyIGVycm9yIl9z KTsKIAogICAgIElkZW50aWZpZXJTZXQgY2FwdHVyZWRWYXJpYWJsZXM7CiAgICAgVW5pcXVlZFN0 cmluZ0ltcGxQdHJTZXQgc2xvcHB5TW9kZUhvaXN0ZWRGdW5jdGlvbnM7CkBAIC0yOTMsNyArMjg3 LDcgQEAgU3RyaW5nIFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUlubmVyKGNvbgogICAgIGlmICht X3NlZW5UYWdnZWRUZW1wbGF0ZSkKICAgICAgICAgZmVhdHVyZXMgfD0gTm9FdmFsQ2FjaGVGZWF0 dXJlOwogCi0jaWZuZGVmIE5ERUJVRworI2lmIEFTU0VSVF9FTkFCTEVECiAgICAgaWYgKG1fcGFy c2luZ0J1aWx0aW4gJiYgaXNQcm9ncmFtUGFyc2VNb2RlKHBhcnNlTW9kZSkpIHsKICAgICAgICAg VmFyaWFibGVFbnZpcm9ubWVudCYgbGV4aWNhbFZhcmlhYmxlcyA9IHNjb3BlLT5sZXhpY2FsVmFy aWFibGVzKCk7CiAgICAgICAgIGNvbnN0IEhhc2hTZXQ8VW5pcXVlZFN0cmluZ0ltcGwqPiYgY2xv c2VkVmFyaWFibGVDYW5kaWRhdGVzID0gc2NvcGUtPmNsb3NlZFZhcmlhYmxlQ2FuZGlkYXRlcygp OwpAQCAtMzA2LDIyICszMDAsOSBAQCBTdHJpbmcgUGFyc2VyPExleGVyVHlwZT46OnBhcnNlSW5u ZXIoY29uCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9Ci0jZW5kaWYgLy8gTkRFQlVH Ci0gICAgZGlkRmluaXNoUGFyc2luZyhzb3VyY2VFbGVtZW50cywgc2NvcGUtPnRha2VGdW5jdGlv bkRlY2xhcmF0aW9ucygpLCB2YXJEZWNsYXJhdGlvbnMsIFdURk1vdmUoc2xvcHB5TW9kZUhvaXN0 ZWRGdW5jdGlvbnMpLCBmZWF0dXJlcywgY29udGV4dC5udW1Db25zdGFudHMoKSk7CisjZW5kaWYg Ly8gQVNTRVJUX0VOQUJMRUQKIAotICAgIHJldHVybiBwYXJzZUVycm9yOwotfQotCi10ZW1wbGF0 ZSA8dHlwZW5hbWUgTGV4ZXJUeXBlPgotdm9pZCBQYXJzZXI8TGV4ZXJUeXBlPjo6ZGlkRmluaXNo UGFyc2luZyhTb3VyY2VFbGVtZW50cyogc291cmNlRWxlbWVudHMsIERlY2xhcmF0aW9uU3RhY2tz OjpGdW5jdGlvblN0YWNrJiYgZnVuY1N0YWNrLCAKLSAgICBWYXJpYWJsZUVudmlyb25tZW50JiB2 YXJEZWNsYXJhdGlvbnMsIFVuaXF1ZWRTdHJpbmdJbXBsUHRyU2V0JiYgc2xvcHB5TW9kZUhvaXN0 ZWRGdW5jdGlvbnMsIENvZGVGZWF0dXJlcyBmZWF0dXJlcywgaW50IG51bUNvbnN0YW50cykKLXsK LSAgICBtX3NvdXJjZUVsZW1lbnRzID0gc291cmNlRWxlbWVudHM7Ci0gICAgbV9mdW5jRGVjbGFy YXRpb25zID0gV1RGTW92ZShmdW5jU3RhY2spOwotICAgIG1fdmFyRGVjbGFyYXRpb25zLnN3YXAo dmFyRGVjbGFyYXRpb25zKTsKLSAgICBtX2ZlYXR1cmVzID0gZmVhdHVyZXM7Ci0gICAgbV9zbG9w cHlNb2RlSG9pc3RlZEZ1bmN0aW9ucyA9IFdURk1vdmUoc2xvcHB5TW9kZUhvaXN0ZWRGdW5jdGlv bnMpOwotICAgIG1fbnVtQ29uc3RhbnRzID0gbnVtQ29uc3RhbnRzOworICAgIHJldHVybiBQYXJz ZUlubmVyUmVzdWx0IHsgcGFyYW1ldGVycywgc291cmNlRWxlbWVudHMsIHNjb3BlLT50YWtlRnVu Y3Rpb25EZWNsYXJhdGlvbnMoKSwgV1RGTW92ZSh2YXJEZWNsYXJhdGlvbnMpLCBXVEZNb3ZlKHNs b3BweU1vZGVIb2lzdGVkRnVuY3Rpb25zKSwgZmVhdHVyZXMsIGNvbnRleHQubnVtQ29uc3RhbnRz KCkgfTsKIH0KIAogdGVtcGxhdGUgPHR5cGVuYW1lIExleGVyVHlwZT4KSW5kZXg6IFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuaAkocmV2aXNpb24gMjU1MDQwKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMTM3Miw3ICsx MzcyLDE2IEBAIHByaXZhdGU6CiAKICAgICBQYXJzZXIoKTsKIAotICAgIFN0cmluZyBwYXJzZUlu bmVyKGNvbnN0IElkZW50aWZpZXImLCBTb3VyY2VQYXJzZU1vZGUsIFBhcnNpbmdDb250ZXh0LCBP cHRpb25hbDxpbnQ+IGZ1bmN0aW9uQ29uc3RydWN0b3JQYXJhbWV0ZXJzRW5kUG9zaXRpb24gPSBX VEY6Om51bGxvcHQsIGNvbnN0IFZlY3RvcjxKU1RleHRQb3NpdGlvbj4qID0gbnVsbHB0cik7Cisg ICAgc3RydWN0IFBhcnNlSW5uZXJSZXN1bHQgeworICAgICAgICBGdW5jdGlvblBhcmFtZXRlcnMq IHBhcmFtZXRlcnM7CisgICAgICAgIFNvdXJjZUVsZW1lbnRzKiBzb3VyY2VFbGVtZW50czsKKyAg ICAgICAgRGVjbGFyYXRpb25TdGFja3M6OkZ1bmN0aW9uU3RhY2sgZnVuY3Rpb25EZWNsYXJhdGlv bnM7CisgICAgICAgIFZhcmlhYmxlRW52aXJvbm1lbnQgdmFyRGVjbGFyYXRpb25zOworICAgICAg ICBVbmlxdWVkU3RyaW5nSW1wbFB0clNldCBzbG9wcHlNb2RlSG9pc3RlZEZ1bmN0aW9uczsKKyAg ICAgICAgQ29kZUZlYXR1cmVzIGZlYXR1cmVzOworICAgICAgICBpbnQgbnVtQ29uc3RhbnRzOwor ICAgIH07CisgICAgRXhwZWN0ZWQ8UGFyc2VJbm5lclJlc3VsdCwgU3RyaW5nPiBwYXJzZUlubmVy KGNvbnN0IElkZW50aWZpZXImLCBTb3VyY2VQYXJzZU1vZGUsIFBhcnNpbmdDb250ZXh0LCBPcHRp b25hbDxpbnQ+IGZ1bmN0aW9uQ29uc3RydWN0b3JQYXJhbWV0ZXJzRW5kUG9zaXRpb24gPSBXVEY6 Om51bGxvcHQsIGNvbnN0IFZlY3RvcjxKU1RleHRQb3NpdGlvbj4qID0gbnVsbHB0cik7CiAKICAg ICB2b2lkIGRpZEZpbmlzaFBhcnNpbmcoU291cmNlRWxlbWVudHMqLCBEZWNsYXJhdGlvblN0YWNr czo6RnVuY3Rpb25TdGFjayYmLCBWYXJpYWJsZUVudmlyb25tZW50JiwgVW5pcXVlZFN0cmluZ0lt cGxQdHJTZXQmJiwgQ29kZUZlYXR1cmVzLCBpbnQpOwogCkBAIC0xODk2LDcgKzE5MDUsNiBAQCBw cml2YXRlOgogICAgIGNvbnN0IFNvdXJjZUNvZGUqIG1fc291cmNlOwogICAgIFBhcnNlckFyZW5h IG1fcGFyc2VyQXJlbmE7CiAgICAgc3RkOjp1bmlxdWVfcHRyPExleGVyVHlwZT4gbV9sZXhlcjsK LSAgICBGdW5jdGlvblBhcmFtZXRlcnMqIG1fcGFyYW1ldGVycyB7IG51bGxwdHIgfTsKIAogICAg IFBhcnNlclN0YXRlIG1fcGFyc2VyU3RhdGU7CiAgICAgCkBAIC0xOTA3LDE2ICsxOTE1LDEwIEBA IHByaXZhdGU6CiAgICAgSlNUZXh0UG9zaXRpb24gbV9sYXN0VG9rZW5FbmRQb3NpdGlvbjsKICAg ICBpbnQgbV9zdGF0ZW1lbnREZXB0aDsKICAgICBSZWZQdHI8U291cmNlUHJvdmlkZXJDYWNoZT4g bV9mdW5jdGlvbkNhY2hlOwotICAgIFNvdXJjZUVsZW1lbnRzKiBtX3NvdXJjZUVsZW1lbnRzOwog ICAgIGJvb2wgbV9wYXJzaW5nQnVpbHRpbjsKICAgICBKU1BhcnNlclNjcmlwdE1vZGUgbV9zY3Jp cHRNb2RlOwogICAgIFN1cGVyQmluZGluZyBtX3N1cGVyQmluZGluZzsKICAgICBDb25zdHJ1Y3Rv cktpbmQgbV9kZWZhdWx0Q29uc3RydWN0b3JLaW5kRm9yVG9wTGV2ZWxGdW5jdGlvbjsKLSAgICBW YXJpYWJsZUVudmlyb25tZW50IG1fdmFyRGVjbGFyYXRpb25zOwotICAgIERlY2xhcmF0aW9uU3Rh Y2tzOjpGdW5jdGlvblN0YWNrIG1fZnVuY0RlY2xhcmF0aW9uczsKLSAgICBVbmlxdWVkU3RyaW5n SW1wbFB0clNldCBtX3Nsb3BweU1vZGVIb2lzdGVkRnVuY3Rpb25zOwotICAgIENvZGVGZWF0dXJl cyBtX2ZlYXR1cmVzOwotICAgIGludCBtX251bUNvbnN0YW50czsKICAgICBFeHByZXNzaW9uRXJy b3JDbGFzc2lmaWVyKiBtX2V4cHJlc3Npb25FcnJvckNsYXNzaWZpZXI7CiAgICAgYm9vbCBtX2lz RXZhbENvbnRleHQ7CiAgICAgYm9vbCBtX2ltbWVkaWF0ZVBhcmVudEFsbG93c0Z1bmN0aW9uRGVj bGFyYXRpb25JblN0YXRlbWVudDsKQEAgLTE5MzcsOCArMTkzOSw2IEBAIHN0ZDo6dW5pcXVlX3B0 cjxQYXJzZWROb2RlPiBQYXJzZXI8TGV4ZXIKICAgICBpZiAoUGFyc2VkTm9kZTo6c2NvcGVJc0Z1 bmN0aW9uKQogICAgICAgICBtX2xleGVyLT5zZXRJc1JlcGFyc2luZ0Z1bmN0aW9uKCk7CiAKLSAg ICBtX3NvdXJjZUVsZW1lbnRzID0gMDsKLQogICAgIGVyckxpbmUgPSAtMTsKICAgICBlcnJNc2cg PSBTdHJpbmcoKTsKIApAQCAtMTk0Niw3ICsxOTQ2LDcgQEAgc3RkOjp1bmlxdWVfcHRyPFBhcnNl ZE5vZGU+IFBhcnNlcjxMZXhlcgogICAgIEFTU0VSVChtX3NvdXJjZS0+c3RhcnRDb2x1bW4oKSA+ IE9yZGluYWxOdW1iZXI6OmJlZm9yZUZpcnN0KCkpOwogICAgIHVuc2lnbmVkIHN0YXJ0Q29sdW1u ID0gbV9zb3VyY2UtPnN0YXJ0Q29sdW1uKCkuemVyb0Jhc2VkSW50KCk7CiAKLSAgICBTdHJpbmcg cGFyc2VFcnJvciA9IHBhcnNlSW5uZXIoY2FsbGVlTmFtZSwgcGFyc2VNb2RlLCBwYXJzaW5nQ29u dGV4dCwgZnVuY3Rpb25Db25zdHJ1Y3RvclBhcmFtZXRlcnNFbmRQb3NpdGlvbiwgaW5zdGFuY2VG aWVsZExvY2F0aW9ucyk7CisgICAgYXV0byBwYXJzZVJlc3VsdCA9IHBhcnNlSW5uZXIoY2FsbGVl TmFtZSwgcGFyc2VNb2RlLCBwYXJzaW5nQ29udGV4dCwgZnVuY3Rpb25Db25zdHJ1Y3RvclBhcmFt ZXRlcnNFbmRQb3NpdGlvbiwgaW5zdGFuY2VGaWVsZExvY2F0aW9ucyk7CiAKICAgICBpbnQgbGlu ZU51bWJlciA9IG1fbGV4ZXItPmxpbmVOdW1iZXIoKTsKICAgICBib29sIGxleEVycm9yID0gbV9s ZXhlci0+c2F3RXJyb3IoKTsKQEAgLTE5NTQsMTQgKzE5NTQsMTMgQEAgc3RkOjp1bmlxdWVfcHRy PFBhcnNlZE5vZGU+IFBhcnNlcjxMZXhlcgogICAgIEFTU0VSVChsZXhFcnJvck1lc3NhZ2UuaXNO dWxsKCkgIT0gbGV4RXJyb3IpOwogICAgIG1fbGV4ZXItPmNsZWFyKCk7CiAKLSAgICBpZiAoIXBh cnNlRXJyb3IuaXNOdWxsKCkgfHwgbGV4RXJyb3IpIHsKKyAgICBpZiAoIXBhcnNlUmVzdWx0IHx8 IGxleEVycm9yKSB7CiAgICAgICAgIGVyckxpbmUgPSBsaW5lTnVtYmVyOwotICAgICAgICBlcnJN c2cgPSAhbGV4RXJyb3JNZXNzYWdlLmlzTnVsbCgpID8gbGV4RXJyb3JNZXNzYWdlIDogcGFyc2VF cnJvcjsKLSAgICAgICAgbV9zb3VyY2VFbGVtZW50cyA9IDA7CisgICAgICAgIGVyck1zZyA9ICFs ZXhFcnJvck1lc3NhZ2UuaXNOdWxsKCkgPyBsZXhFcnJvck1lc3NhZ2UgOiBwYXJzZVJlc3VsdC5l cnJvcigpOwogICAgIH0KIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxQYXJzZWROb2RlPiByZXN1bHQ7 Ci0gICAgaWYgKG1fc291cmNlRWxlbWVudHMpIHsKKyAgICBpZiAocGFyc2VSZXN1bHQpIHsKICAg ICAgICAgSlNUb2tlbkxvY2F0aW9uIGVuZExvY2F0aW9uOwogICAgICAgICBlbmRMb2NhdGlvbi5s aW5lID0gbV9sZXhlci0+bGluZU51bWJlcigpOwogICAgICAgICBlbmRMb2NhdGlvbi5saW5lU3Rh cnRPZmZzZXQgPSBtX2xleGVyLT5jdXJyZW50TGluZVN0YXJ0T2Zmc2V0KCk7CkBAIC0xOTcyLDE2 ICsxOTcxLDE2IEBAIHN0ZDo6dW5pcXVlX3B0cjxQYXJzZWROb2RlPiBQYXJzZXI8TGV4ZXIKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVuZExvY2F0aW9uLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhcnRDb2x1bW4sCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBlbmRDb2x1bW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBtX3NvdXJjZUVsZW1lbnRzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbV92YXJEZWNsYXJhdGlvbnMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBXVEZNb3ZlKG1fZnVuY0RlY2xhcmF0aW9ucyksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBwYXJzZVJlc3VsdC52YWx1ZSgpLnNvdXJjZUVsZW1lbnRzLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyc2VSZXN1bHQudmFsdWUoKS52YXJE ZWNsYXJhdGlvbnMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXVEZNb3Zl KHBhcnNlUmVzdWx0LnZhbHVlKCkuZnVuY3Rpb25EZWNsYXJhdGlvbnMpLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY3VycmVudFNjb3BlKCktPmZpbmFsaXplTGV4aWNhbEVu dmlyb25tZW50KCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXVEZNb3Zl KG1fc2xvcHB5TW9kZUhvaXN0ZWRGdW5jdGlvbnMpLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbV9wYXJhbWV0ZXJzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgV1RGTW92ZShwYXJzZVJlc3VsdC52YWx1ZSgpLnNsb3BweU1vZGVIb2lzdGVkRnVuY3Rp b25zKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcnNlUmVzdWx0LnZh bHVlKCkucGFyYW1ldGVycywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICpt X3NvdXJjZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZmVhdHVyZXMs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXJzZVJlc3VsdC52YWx1ZSgp LmZlYXR1cmVzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3VycmVudFNj b3BlKCktPmlubmVyQXJyb3dGdW5jdGlvbkZlYXR1cmVzKCksCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBtX251bUNvbnN0YW50cywKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHBhcnNlUmVzdWx0LnZhbHVlKCkubnVtQ29uc3RhbnRzLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgV1RGTW92ZShtX21vZHVsZVNjb3BlRGF0YSkpOwog ICAgICAgICByZXN1bHQtPnNldExvYyhtX3NvdXJjZS0+Zmlyc3RMaW5lKCkub25lQmFzZWRJbnQo KSwgbV9sZXhlci0+bGluZU51bWJlcigpLCBtX2xleGVyLT5jdXJyZW50T2Zmc2V0KCksIG1fbGV4 ZXItPmN1cnJlbnRMaW5lU3RhcnRPZmZzZXQoKSk7CiAgICAgICAgIHJlc3VsdC0+c2V0RW5kT2Zm c2V0KG1fbGV4ZXItPmN1cnJlbnRPZmZzZXQoKSk7Cg== 388632 2020-01-23 18:09:48 -0800 2020-01-23 18:54:42 -0800 patch for landing a-backup.diff text/plain 11232 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjU1MDQzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBA CisyMDIwLTAxLTIzICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEdldCByaWQgb2YgZGlkRmluaXNoUGFyc2luZyBhbmQgbWFrZSBwYXJzZUlubmVyIHJldHVybiBp dHMgcmVzdWx0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjA2NzA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTWFyayBMYW0gYW5kIEtlaXRoIE1pbGxl ciBhbmQgWXVzdWtlIFN1enVraS4KKworICAgICAgICBUaGlzIGlzIHBhdmluZyB0aGUgd2F5IGZv ciBlYWdlcmx5IHBhcnNpbmcgaW1tZWRpYXRlbHkgaW52b2tlZCBmdW5jdGlvbnMuCisgICAgICAg IEJlZm9yZSwgd2UnZCBqdXN0IGVuZCB1cCBzZXR0aW5nIG1lbWJlciBmaWVsZHMgaW5zaWRlIDo6 ZGlkRmluaXNoUGFyc2luZywKKyAgICAgICAgYW5kIHRoZW4gcmVhZCB0aGVtIG91dCBpbnNpZGUg OjpwYXJzZS4gSG93ZXZlciwgdGhpcyBpcyBub3QgZ29pbmcgdG8gd29yaworICAgICAgICB3aGVu IHdlIGFyZSBpbiBhIHdvcmxkIHdoZXJlIHdlJ3JlIGdlbmVyYXRpbmcgQVNUIG5vZGVzIGZvciBt b3JlIHRoYW4gb25lCisgICAgICAgIGZ1bmN0aW9uIGF0IGEgdGltZS4gVGhpcyBwYXRjaCBwYXZl cyB0aGUgd2F5IGZvciB0aGF0LgorCisgICAgICAgICogcGFyc2VyL1BhcnNlci5jcHA6CisgICAg ICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpQYXJzZXIpOgorICAgICAgICAoSlNDOjpQYXJz ZXI8TGV4ZXJUeXBlPjo6cGFyc2VJbm5lcik6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5 cGU+OjpkaWRGaW5pc2hQYXJzaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKiBwYXJzZXIvUGFyc2Vy Lmg6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZSk6CisKIDIwMjAtMDEt MjMgIFJvYmluIE1vcmlzc2V0ICA8cm1vcmlzc2V0QGFwcGxlLmNvbT4KIAogICAgICAgICBEb24n dCBpbmNsdWRlIEJ5dGVjb2RlU3RydWN0cy5oIGluIENvbW1vblNsb3dQYXRocy5oCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCShyZXZpc2lvbiAyNTUwNDApCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTEzMiw3ICsxMzIsNiBAQCBQYXJzZXI8TGV4ZXJUeXBlPjo6UGFyc2VyKFZNJiB2bSwgY29u c3QgCiAgICAgLCBtX2hhc1N0YWNrT3ZlcmZsb3coZmFsc2UpCiAgICAgLCBtX2FsbG93c0luKHRy dWUpCiAgICAgLCBtX3N0YXRlbWVudERlcHRoKDApCi0gICAgLCBtX3NvdXJjZUVsZW1lbnRzKDAp CiAgICAgLCBtX3BhcnNpbmdCdWlsdGluKGJ1aWx0aW5Nb2RlID09IEpTUGFyc2VyQnVpbHRpbk1v ZGU6OkJ1aWx0aW4pCiAgICAgLCBtX3NjcmlwdE1vZGUoc2NyaXB0TW9kZSkKICAgICAsIG1fc3Vw ZXJCaW5kaW5nKHN1cGVyQmluZGluZykKQEAgLTIwOCwyNCArMjA3LDIzIEBAIFBhcnNlcjxMZXhl clR5cGU+Ojp+UGFyc2VyKCkKIH0KIAogdGVtcGxhdGUgPHR5cGVuYW1lIExleGVyVHlwZT4KLVN0 cmluZyBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VJbm5lcihjb25zdCBJZGVudGlmaWVyJiBjYWxs ZWVOYW1lLCBTb3VyY2VQYXJzZU1vZGUgcGFyc2VNb2RlLCBQYXJzaW5nQ29udGV4dCBwYXJzaW5n Q29udGV4dCwgT3B0aW9uYWw8aW50PiBmdW5jdGlvbkNvbnN0cnVjdG9yUGFyYW1ldGVyc0VuZFBv c2l0aW9uLCBjb25zdCBWZWN0b3I8SlNUZXh0UG9zaXRpb24+KiBpbnN0YW5jZUZpZWxkTG9jYXRp b25zKQorRXhwZWN0ZWQ8dHlwZW5hbWUgUGFyc2VyPExleGVyVHlwZT46OlBhcnNlSW5uZXJSZXN1 bHQsIFN0cmluZz4gUGFyc2VyPExleGVyVHlwZT46OnBhcnNlSW5uZXIoY29uc3QgSWRlbnRpZmll ciYgY2FsbGVlTmFtZSwgU291cmNlUGFyc2VNb2RlIHBhcnNlTW9kZSwgUGFyc2luZ0NvbnRleHQg cGFyc2luZ0NvbnRleHQsIE9wdGlvbmFsPGludD4gZnVuY3Rpb25Db25zdHJ1Y3RvclBhcmFtZXRl cnNFbmRQb3NpdGlvbiwgY29uc3QgVmVjdG9yPEpTVGV4dFBvc2l0aW9uPiogaW5zdGFuY2VGaWVs ZExvY2F0aW9ucykKIHsKLSAgICBTdHJpbmcgcGFyc2VFcnJvciA9IFN0cmluZygpOwotCiAgICAg QVNUQnVpbGRlciBjb250ZXh0KGNvbnN0X2Nhc3Q8Vk0mPihtX3ZtKSwgbV9wYXJzZXJBcmVuYSwg Y29uc3RfY2FzdDxTb3VyY2VDb2RlKj4obV9zb3VyY2UpKTsKICAgICBTY29wZVJlZiBzY29wZSA9 IGN1cnJlbnRTY29wZSgpOwogICAgIHNjb3BlLT5zZXRJc0xleGljYWxTY29wZSgpOwogICAgIFNl dEZvclNjb3BlPEZ1bmN0aW9uUGFyc2VQaGFzZT4gZnVuY3Rpb25QYXJzZVBoYXNlUG9pc29uZXIo bV9wYXJzZXJTdGF0ZS5mdW5jdGlvblBhcnNlUGhhc2UsIEZ1bmN0aW9uUGFyc2VQaGFzZTo6Qm9k eSk7CiAKKyAgICBGdW5jdGlvblBhcmFtZXRlcnMqIHBhcmFtZXRlcnMgPSBudWxscHRyOwogICAg IGJvb2wgaXNBcnJvd0Z1bmN0aW9uQm9keUV4cHJlc3Npb24gPSBwYXJzZU1vZGUgPT0gU291cmNl UGFyc2VNb2RlOjpBc3luY0Fycm93RnVuY3Rpb25Cb2R5TW9kZSAmJiAhbWF0Y2goT1BFTkJSQUNF KTsKICAgICBpZiAobV9sZXhlci0+aXNSZXBhcnNpbmdGdW5jdGlvbigpKSB7CiAgICAgICAgIFBh cnNlckZ1bmN0aW9uSW5mbzxBU1RCdWlsZGVyPiBmdW5jdGlvbkluZm87CiAgICAgICAgIGlmIChp c0dlbmVyYXRvck9yQXN5bmNGdW5jdGlvbkJvZHlQYXJzZU1vZGUocGFyc2VNb2RlKSkKLSAgICAg ICAgICAgIG1fcGFyYW1ldGVycyA9IGNyZWF0ZUdlbmVyYXRvclBhcmFtZXRlcnMoY29udGV4dCwg ZnVuY3Rpb25JbmZvLnBhcmFtZXRlckNvdW50KTsKKyAgICAgICAgICAgIHBhcmFtZXRlcnMgPSBj cmVhdGVHZW5lcmF0b3JQYXJhbWV0ZXJzKGNvbnRleHQsIGZ1bmN0aW9uSW5mby5wYXJhbWV0ZXJD b3VudCk7CiAgICAgICAgIGVsc2UgaWYgKHBhcnNlTW9kZSA9PSBTb3VyY2VQYXJzZU1vZGU6Oklu c3RhbmNlRmllbGRJbml0aWFsaXplck1vZGUpCi0gICAgICAgICAgICBtX3BhcmFtZXRlcnMgPSBj b250ZXh0LmNyZWF0ZUZvcm1hbFBhcmFtZXRlckxpc3QoKTsKKyAgICAgICAgICAgIHBhcmFtZXRl cnMgPSBjb250ZXh0LmNyZWF0ZUZvcm1hbFBhcmFtZXRlckxpc3QoKTsKICAgICAgICAgZWxzZQot ICAgICAgICAgICAgbV9wYXJhbWV0ZXJzID0gcGFyc2VGdW5jdGlvblBhcmFtZXRlcnMoY29udGV4 dCwgcGFyc2VNb2RlLCBmdW5jdGlvbkluZm8pOworICAgICAgICAgICAgcGFyYW1ldGVycyA9IHBh cnNlRnVuY3Rpb25QYXJhbWV0ZXJzKGNvbnRleHQsIHBhcnNlTW9kZSwgZnVuY3Rpb25JbmZvKTsK IAogICAgICAgICBpZiAoU291cmNlUGFyc2VNb2RlU2V0KFNvdXJjZVBhcnNlTW9kZTo6QXJyb3dG dW5jdGlvbk1vZGUsIFNvdXJjZVBhcnNlTW9kZTo6QXN5bmNBcnJvd0Z1bmN0aW9uTW9kZSkuY29u dGFpbnMocGFyc2VNb2RlKSAmJiAhaGFzRXJyb3IoKSkgewogICAgICAgICAgICAgLy8gVGhlIG9u bHkgd2F5IHdlIGNvdWxkIGhhdmUgYW4gZXJyb3Igd2lsZSByZXBhcnNpbmcgaXMgaWYgd2UgcnVu IG91dCBvZiBzdGFjayBzcGFjZS4KQEAgLTI2NCwxMiArMjYyLDggQEAgU3RyaW5nIFBhcnNlcjxM ZXhlclR5cGU+OjpwYXJzZUlubmVyKGNvbgogICAgIH0KIAogICAgIGJvb2wgdmFsaWRFbmRpbmcg PSBjb25zdW1lKEVPRlRPSyk7Ci0gICAgaWYgKCFzb3VyY2VFbGVtZW50cyB8fCAhdmFsaWRFbmRp bmcpIHsKLSAgICAgICAgaWYgKGhhc0Vycm9yKCkpCi0gICAgICAgICAgICBwYXJzZUVycm9yID0g bV9lcnJvck1lc3NhZ2U7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHBhcnNlRXJyb3IgPSAi UGFyc2VyIGVycm9yIl9zOwotICAgIH0KKyAgICBpZiAoIXNvdXJjZUVsZW1lbnRzIHx8ICF2YWxp ZEVuZGluZykKKyAgICAgICAgcmV0dXJuIG1ha2VVbmV4cGVjdGVkKGhhc0Vycm9yKCkgPyBtX2Vy cm9yTWVzc2FnZSA6ICJQYXJzZXIgZXJyb3IiX3MpOwogCiAgICAgSWRlbnRpZmllclNldCBjYXB0 dXJlZFZhcmlhYmxlczsKICAgICBVbmlxdWVkU3RyaW5nSW1wbFB0clNldCBzbG9wcHlNb2RlSG9p c3RlZEZ1bmN0aW9uczsKQEAgLTI5Myw3ICsyODcsNyBAQCBTdHJpbmcgUGFyc2VyPExleGVyVHlw ZT46OnBhcnNlSW5uZXIoY29uCiAgICAgaWYgKG1fc2VlblRhZ2dlZFRlbXBsYXRlKQogICAgICAg ICBmZWF0dXJlcyB8PSBOb0V2YWxDYWNoZUZlYXR1cmU7CiAKLSNpZm5kZWYgTkRFQlVHCisjaWYg QVNTRVJUX0VOQUJMRUQKICAgICBpZiAobV9wYXJzaW5nQnVpbHRpbiAmJiBpc1Byb2dyYW1QYXJz ZU1vZGUocGFyc2VNb2RlKSkgewogICAgICAgICBWYXJpYWJsZUVudmlyb25tZW50JiBsZXhpY2Fs VmFyaWFibGVzID0gc2NvcGUtPmxleGljYWxWYXJpYWJsZXMoKTsKICAgICAgICAgY29uc3QgSGFz aFNldDxVbmlxdWVkU3RyaW5nSW1wbCo+JiBjbG9zZWRWYXJpYWJsZUNhbmRpZGF0ZXMgPSBzY29w ZS0+Y2xvc2VkVmFyaWFibGVDYW5kaWRhdGVzKCk7CkBAIC0zMDYsMjIgKzMwMCw5IEBAIFN0cmlu ZyBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VJbm5lcihjb24KICAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgIH0KLSNlbmRpZiAvLyBOREVCVUcKLSAgICBkaWRGaW5pc2hQYXJzaW5nKHNvdXJj ZUVsZW1lbnRzLCBzY29wZS0+dGFrZUZ1bmN0aW9uRGVjbGFyYXRpb25zKCksIHZhckRlY2xhcmF0 aW9ucywgV1RGTW92ZShzbG9wcHlNb2RlSG9pc3RlZEZ1bmN0aW9ucyksIGZlYXR1cmVzLCBjb250 ZXh0Lm51bUNvbnN0YW50cygpKTsKKyNlbmRpZiAvLyBBU1NFUlRfRU5BQkxFRAogCi0gICAgcmV0 dXJuIHBhcnNlRXJyb3I7Ci19Ci0KLXRlbXBsYXRlIDx0eXBlbmFtZSBMZXhlclR5cGU+Ci12b2lk IFBhcnNlcjxMZXhlclR5cGU+OjpkaWRGaW5pc2hQYXJzaW5nKFNvdXJjZUVsZW1lbnRzKiBzb3Vy Y2VFbGVtZW50cywgRGVjbGFyYXRpb25TdGFja3M6OkZ1bmN0aW9uU3RhY2smJiBmdW5jU3RhY2ss IAotICAgIFZhcmlhYmxlRW52aXJvbm1lbnQmIHZhckRlY2xhcmF0aW9ucywgVW5pcXVlZFN0cmlu Z0ltcGxQdHJTZXQmJiBzbG9wcHlNb2RlSG9pc3RlZEZ1bmN0aW9ucywgQ29kZUZlYXR1cmVzIGZl YXR1cmVzLCBpbnQgbnVtQ29uc3RhbnRzKQotewotICAgIG1fc291cmNlRWxlbWVudHMgPSBzb3Vy Y2VFbGVtZW50czsKLSAgICBtX2Z1bmNEZWNsYXJhdGlvbnMgPSBXVEZNb3ZlKGZ1bmNTdGFjayk7 Ci0gICAgbV92YXJEZWNsYXJhdGlvbnMuc3dhcCh2YXJEZWNsYXJhdGlvbnMpOwotICAgIG1fZmVh dHVyZXMgPSBmZWF0dXJlczsKLSAgICBtX3Nsb3BweU1vZGVIb2lzdGVkRnVuY3Rpb25zID0gV1RG TW92ZShzbG9wcHlNb2RlSG9pc3RlZEZ1bmN0aW9ucyk7Ci0gICAgbV9udW1Db25zdGFudHMgPSBu dW1Db25zdGFudHM7CisgICAgcmV0dXJuIFBhcnNlSW5uZXJSZXN1bHQgeyBwYXJhbWV0ZXJzLCBz b3VyY2VFbGVtZW50cywgc2NvcGUtPnRha2VGdW5jdGlvbkRlY2xhcmF0aW9ucygpLCBXVEZNb3Zl KHZhckRlY2xhcmF0aW9ucyksIFdURk1vdmUoc2xvcHB5TW9kZUhvaXN0ZWRGdW5jdGlvbnMpLCBm ZWF0dXJlcywgY29udGV4dC5udW1Db25zdGFudHMoKSB9OwogfQogCiB0ZW1wbGF0ZSA8dHlwZW5h bWUgTGV4ZXJUeXBlPgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5oCShy ZXZpc2lvbiAyNTUwNDApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5o CSh3b3JraW5nIGNvcHkpCkBAIC0xMzcyLDcgKzEzNzIsMTYgQEAgcHJpdmF0ZToKIAogICAgIFBh cnNlcigpOwogCi0gICAgU3RyaW5nIHBhcnNlSW5uZXIoY29uc3QgSWRlbnRpZmllciYsIFNvdXJj ZVBhcnNlTW9kZSwgUGFyc2luZ0NvbnRleHQsIE9wdGlvbmFsPGludD4gZnVuY3Rpb25Db25zdHJ1 Y3RvclBhcmFtZXRlcnNFbmRQb3NpdGlvbiA9IFdURjo6bnVsbG9wdCwgY29uc3QgVmVjdG9yPEpT VGV4dFBvc2l0aW9uPiogPSBudWxscHRyKTsKKyAgICBzdHJ1Y3QgUGFyc2VJbm5lclJlc3VsdCB7 CisgICAgICAgIEZ1bmN0aW9uUGFyYW1ldGVycyogcGFyYW1ldGVyczsKKyAgICAgICAgU291cmNl RWxlbWVudHMqIHNvdXJjZUVsZW1lbnRzOworICAgICAgICBEZWNsYXJhdGlvblN0YWNrczo6RnVu Y3Rpb25TdGFjayBmdW5jdGlvbkRlY2xhcmF0aW9uczsKKyAgICAgICAgVmFyaWFibGVFbnZpcm9u bWVudCB2YXJEZWNsYXJhdGlvbnM7CisgICAgICAgIFVuaXF1ZWRTdHJpbmdJbXBsUHRyU2V0IHNs b3BweU1vZGVIb2lzdGVkRnVuY3Rpb25zOworICAgICAgICBDb2RlRmVhdHVyZXMgZmVhdHVyZXM7 CisgICAgICAgIGludCBudW1Db25zdGFudHM7CisgICAgfTsKKyAgICBFeHBlY3RlZDxQYXJzZUlu bmVyUmVzdWx0LCBTdHJpbmc+IHBhcnNlSW5uZXIoY29uc3QgSWRlbnRpZmllciYsIFNvdXJjZVBh cnNlTW9kZSwgUGFyc2luZ0NvbnRleHQsIE9wdGlvbmFsPGludD4gZnVuY3Rpb25Db25zdHJ1Y3Rv clBhcmFtZXRlcnNFbmRQb3NpdGlvbiA9IFdURjo6bnVsbG9wdCwgY29uc3QgVmVjdG9yPEpTVGV4 dFBvc2l0aW9uPiogPSBudWxscHRyKTsKIAogICAgIHZvaWQgZGlkRmluaXNoUGFyc2luZyhTb3Vy Y2VFbGVtZW50cyosIERlY2xhcmF0aW9uU3RhY2tzOjpGdW5jdGlvblN0YWNrJiYsIFZhcmlhYmxl RW52aXJvbm1lbnQmLCBVbmlxdWVkU3RyaW5nSW1wbFB0clNldCYmLCBDb2RlRmVhdHVyZXMsIGlu dCk7CiAKQEAgLTE4OTYsNyArMTkwNSw2IEBAIHByaXZhdGU6CiAgICAgY29uc3QgU291cmNlQ29k ZSogbV9zb3VyY2U7CiAgICAgUGFyc2VyQXJlbmEgbV9wYXJzZXJBcmVuYTsKICAgICBzdGQ6OnVu aXF1ZV9wdHI8TGV4ZXJUeXBlPiBtX2xleGVyOwotICAgIEZ1bmN0aW9uUGFyYW1ldGVycyogbV9w YXJhbWV0ZXJzIHsgbnVsbHB0ciB9OwogCiAgICAgUGFyc2VyU3RhdGUgbV9wYXJzZXJTdGF0ZTsK ICAgICAKQEAgLTE5MDcsMTYgKzE5MTUsMTAgQEAgcHJpdmF0ZToKICAgICBKU1RleHRQb3NpdGlv biBtX2xhc3RUb2tlbkVuZFBvc2l0aW9uOwogICAgIGludCBtX3N0YXRlbWVudERlcHRoOwogICAg IFJlZlB0cjxTb3VyY2VQcm92aWRlckNhY2hlPiBtX2Z1bmN0aW9uQ2FjaGU7Ci0gICAgU291cmNl RWxlbWVudHMqIG1fc291cmNlRWxlbWVudHM7CiAgICAgYm9vbCBtX3BhcnNpbmdCdWlsdGluOwog ICAgIEpTUGFyc2VyU2NyaXB0TW9kZSBtX3NjcmlwdE1vZGU7CiAgICAgU3VwZXJCaW5kaW5nIG1f c3VwZXJCaW5kaW5nOwogICAgIENvbnN0cnVjdG9yS2luZCBtX2RlZmF1bHRDb25zdHJ1Y3Rvcktp bmRGb3JUb3BMZXZlbEZ1bmN0aW9uOwotICAgIFZhcmlhYmxlRW52aXJvbm1lbnQgbV92YXJEZWNs YXJhdGlvbnM7Ci0gICAgRGVjbGFyYXRpb25TdGFja3M6OkZ1bmN0aW9uU3RhY2sgbV9mdW5jRGVj bGFyYXRpb25zOwotICAgIFVuaXF1ZWRTdHJpbmdJbXBsUHRyU2V0IG1fc2xvcHB5TW9kZUhvaXN0 ZWRGdW5jdGlvbnM7Ci0gICAgQ29kZUZlYXR1cmVzIG1fZmVhdHVyZXM7Ci0gICAgaW50IG1fbnVt Q29uc3RhbnRzOwogICAgIEV4cHJlc3Npb25FcnJvckNsYXNzaWZpZXIqIG1fZXhwcmVzc2lvbkVy cm9yQ2xhc3NpZmllcjsKICAgICBib29sIG1faXNFdmFsQ29udGV4dDsKICAgICBib29sIG1faW1t ZWRpYXRlUGFyZW50QWxsb3dzRnVuY3Rpb25EZWNsYXJhdGlvbkluU3RhdGVtZW50OwpAQCAtMTkz Nyw4ICsxOTM5LDYgQEAgc3RkOjp1bmlxdWVfcHRyPFBhcnNlZE5vZGU+IFBhcnNlcjxMZXhlcgog ICAgIGlmIChQYXJzZWROb2RlOjpzY29wZUlzRnVuY3Rpb24pCiAgICAgICAgIG1fbGV4ZXItPnNl dElzUmVwYXJzaW5nRnVuY3Rpb24oKTsKIAotICAgIG1fc291cmNlRWxlbWVudHMgPSAwOwotCiAg ICAgZXJyTGluZSA9IC0xOwogICAgIGVyck1zZyA9IFN0cmluZygpOwogCkBAIC0xOTQ2LDcgKzE5 NDYsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8UGFyc2VkTm9kZT4gUGFyc2VyPExleGVyCiAgICAgQVNT RVJUKG1fc291cmNlLT5zdGFydENvbHVtbigpID4gT3JkaW5hbE51bWJlcjo6YmVmb3JlRmlyc3Qo KSk7CiAgICAgdW5zaWduZWQgc3RhcnRDb2x1bW4gPSBtX3NvdXJjZS0+c3RhcnRDb2x1bW4oKS56 ZXJvQmFzZWRJbnQoKTsKIAotICAgIFN0cmluZyBwYXJzZUVycm9yID0gcGFyc2VJbm5lcihjYWxs ZWVOYW1lLCBwYXJzZU1vZGUsIHBhcnNpbmdDb250ZXh0LCBmdW5jdGlvbkNvbnN0cnVjdG9yUGFy YW1ldGVyc0VuZFBvc2l0aW9uLCBpbnN0YW5jZUZpZWxkTG9jYXRpb25zKTsKKyAgICBhdXRvIHBh cnNlUmVzdWx0ID0gcGFyc2VJbm5lcihjYWxsZWVOYW1lLCBwYXJzZU1vZGUsIHBhcnNpbmdDb250 ZXh0LCBmdW5jdGlvbkNvbnN0cnVjdG9yUGFyYW1ldGVyc0VuZFBvc2l0aW9uLCBpbnN0YW5jZUZp ZWxkTG9jYXRpb25zKTsKIAogICAgIGludCBsaW5lTnVtYmVyID0gbV9sZXhlci0+bGluZU51bWJl cigpOwogICAgIGJvb2wgbGV4RXJyb3IgPSBtX2xleGVyLT5zYXdFcnJvcigpOwpAQCAtMTk1NCwx NCArMTk1NCwxMyBAQCBzdGQ6OnVuaXF1ZV9wdHI8UGFyc2VkTm9kZT4gUGFyc2VyPExleGVyCiAg ICAgQVNTRVJUKGxleEVycm9yTWVzc2FnZS5pc051bGwoKSAhPSBsZXhFcnJvcik7CiAgICAgbV9s ZXhlci0+Y2xlYXIoKTsKIAotICAgIGlmICghcGFyc2VFcnJvci5pc051bGwoKSB8fCBsZXhFcnJv cikgeworICAgIGlmICghcGFyc2VSZXN1bHQgfHwgbGV4RXJyb3IpIHsKICAgICAgICAgZXJyTGlu ZSA9IGxpbmVOdW1iZXI7Ci0gICAgICAgIGVyck1zZyA9ICFsZXhFcnJvck1lc3NhZ2UuaXNOdWxs KCkgPyBsZXhFcnJvck1lc3NhZ2UgOiBwYXJzZUVycm9yOwotICAgICAgICBtX3NvdXJjZUVsZW1l bnRzID0gMDsKKyAgICAgICAgZXJyTXNnID0gIWxleEVycm9yTWVzc2FnZS5pc051bGwoKSA/IGxl eEVycm9yTWVzc2FnZSA6IHBhcnNlUmVzdWx0LmVycm9yKCk7CiAgICAgfQogCiAgICAgc3RkOjp1 bmlxdWVfcHRyPFBhcnNlZE5vZGU+IHJlc3VsdDsKLSAgICBpZiAobV9zb3VyY2VFbGVtZW50cykg eworICAgIGlmIChwYXJzZVJlc3VsdCkgewogICAgICAgICBKU1Rva2VuTG9jYXRpb24gZW5kTG9j YXRpb247CiAgICAgICAgIGVuZExvY2F0aW9uLmxpbmUgPSBtX2xleGVyLT5saW5lTnVtYmVyKCk7 CiAgICAgICAgIGVuZExvY2F0aW9uLmxpbmVTdGFydE9mZnNldCA9IG1fbGV4ZXItPmN1cnJlbnRM aW5lU3RhcnRPZmZzZXQoKTsKQEAgLTE5NzIsMTYgKzE5NzEsMTYgQEAgc3RkOjp1bmlxdWVfcHRy PFBhcnNlZE5vZGU+IFBhcnNlcjxMZXhlcgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZW5kTG9jYXRpb24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz dGFydENvbHVtbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVuZENvbHVt biwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fc291cmNlRWxlbWVudHMs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3ZhckRlY2xhcmF0aW9ucywK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdURk1vdmUobV9mdW5jRGVjbGFy YXRpb25zKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcnNlUmVzdWx0 LnZhbHVlKCkuc291cmNlRWxlbWVudHMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwYXJzZVJlc3VsdC52YWx1ZSgpLnZhckRlY2xhcmF0aW9ucywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFdURk1vdmUocGFyc2VSZXN1bHQudmFsdWUoKS5mdW5jdGlv bkRlY2xhcmF0aW9ucyksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjdXJy ZW50U2NvcGUoKS0+ZmluYWxpemVMZXhpY2FsRW52aXJvbm1lbnQoKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFdURk1vdmUobV9zbG9wcHlNb2RlSG9pc3RlZEZ1bmN0aW9u cyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3BhcmFtZXRlcnMsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXVEZNb3ZlKHBhcnNlUmVzdWx0LnZh bHVlKCkuc2xvcHB5TW9kZUhvaXN0ZWRGdW5jdGlvbnMpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcGFyc2VSZXN1bHQudmFsdWUoKS5wYXJhbWV0ZXJzLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKm1fc291cmNlLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbV9mZWF0dXJlcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHBhcnNlUmVzdWx0LnZhbHVlKCkuZmVhdHVyZXMsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjdXJyZW50U2NvcGUoKS0+aW5uZXJBcnJvd0Z1bmN0aW9uRmVh dHVyZXMoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fbnVtQ29uc3Rh bnRzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFyc2VSZXN1bHQudmFs dWUoKS5udW1Db25zdGFudHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBX VEZNb3ZlKG1fbW9kdWxlU2NvcGVEYXRhKSk7CiAgICAgICAgIHJlc3VsdC0+c2V0TG9jKG1fc291 cmNlLT5maXJzdExpbmUoKS5vbmVCYXNlZEludCgpLCBtX2xleGVyLT5saW5lTnVtYmVyKCksIG1f bGV4ZXItPmN1cnJlbnRPZmZzZXQoKSwgbV9sZXhlci0+Y3VycmVudExpbmVTdGFydE9mZnNldCgp KTsKICAgICAgICAgcmVzdWx0LT5zZXRFbmRPZmZzZXQobV9sZXhlci0+Y3VycmVudE9mZnNldCgp KTsK