175907 2017-08-23 14:28:46 -0700 Stop using PolicyCallback for new window policies 2017-08-24 14:45:43 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen aestes buildbot cdumez commit-queue dbates japhet ryanhaddad webkit-bug-importer oldest_to_newest 1341782 0 achristensen 2017-08-23 14:28:46 -0700 Stop using PolicyCallback for new window policies 1341789 1 318922 achristensen 2017-08-23 14:38:17 -0700 Created attachment 318922 Patch 1341811 2 achristensen 2017-08-23 15:11:36 -0700 I made the NavigationAction copy more explicit. http://trac.webkit.org/r221109 1341891 3 ryanhaddad 2017-08-23 17:15:54 -0700 (In reply to Alex Christensen from comment #2) > I made the NavigationAction copy more explicit. > http://trac.webkit.org/r221109 This change introduced assertion failures on iOS and macOS: https://build.webkit.org/results/Apple%20Sierra%20Debug%20WK2%20(Tests)/r221109%20(2679)/results.html https://build.webkit.org/results/Apple%20iOS%2010%20Simulator%20Debug%20WK2%20(Tests)/r221109%20(3496)/results.html 1341893 4 webkit-bug-importer 2017-08-23 17:16:13 -0700 <rdar://problem/34048194> 1341899 5 ryanhaddad 2017-08-23 17:26:39 -0700 (In reply to Ryan Haddad from comment #3) > (In reply to Alex Christensen from comment #2) > > I made the NavigationAction copy more explicit. > > http://trac.webkit.org/r221109 > This change introduced assertion failures on iOS and macOS: > https://build.webkit.org/results/Apple%20Sierra%20Debug%20WK2%20(Tests)/ > r221109%20(2679)/results.html > https://build.webkit.org/results/ > Apple%20iOS%2010%20Simulator%20Debug%20WK2%20(Tests)/r221109%20(3496)/ > results.html SHOULD NEVER BE REACHED /Volumes/Data/slave/sierra-debug/build/Source/WebCore/loader/PolicyChecker.cpp(177) : auto WebCore::PolicyChecker::checkNewWindowPolicy(WebCore::NavigationAction &&, const WebCore::ResourceRequest &, WebCore::FormState *, const WTF::String &, NewWindowPolicyDecisionFunction)::(anonymous class)::operator()(WebCore::PolicyAction) const 1341904 6 ryanhaddad 2017-08-23 17:31:27 -0700 Reverted r221109 for reason: This change caused assertion failures on iOS and macOS debug bots. Committed r221122: <http://trac.webkit.org/changeset/221122> 1342096 7 318922 achristensen 2017-08-24 11:09:21 -0700 Comment on attachment 318922 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=318922&action=review > Source/WebCore/loader/PolicyChecker.cpp:171 > + break; Oops, these need to be returns. 1342097 8 318998 achristensen 2017-08-24 11:10:35 -0700 Created attachment 318998 patch 1342169 9 318998 commit-queue 2017-08-24 14:45:42 -0700 Comment on attachment 318998 patch Clearing flags on attachment: 318998 Committed r221162: <http://trac.webkit.org/changeset/221162> 1342170 10 commit-queue 2017-08-24 14:45:43 -0700 All reviewed patches have been landed. Closing bug. 318922 2017-08-23 14:38:17 -0700 2017-08-24 11:10:35 -0700 Patch bug-175907-20170823143816.patch text/plain 11038 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMTEwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA4LTIzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3RvcCB1c2lu ZyBQb2xpY3lDYWxsYmFjayBmb3IgbmV3IHdpbmRvdyBwb2xpY2llcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1OTA3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUG9saWN5Q2FsbGJhY2sgaXMgYW4gYXJ0 aWZhY3QgZnJvbSB0aGUgZGF5cyBiZWZvcmUgQysrMTEuICBMZXQncyB1c2UgbGFtYmRhcyBpbnN0 ZWFkIQorICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3VyLgorCisgICAgICAgICogbG9hZGVy L1BvbGljeUNhbGxiYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvbGljeUNhbGxiYWNrOjpz ZXQpOgorICAgICAgICAoV2ViQ29yZTo6UG9saWN5Q2FsbGJhY2s6OmNhbGwpOgorICAgICAgICAo V2ViQ29yZTo6UG9saWN5Q2FsbGJhY2s6OmNhbmNlbCk6CisgICAgICAgICogbG9hZGVyL1BvbGlj eUNhbGxiYWNrLmg6CisgICAgICAgICogbG9hZGVyL1BvbGljeUNoZWNrZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UG9saWN5Q2hlY2tlcjo6Y2hlY2tOZXdXaW5kb3dQb2xpY3kpOgorICAgICAg ICAoV2ViQ29yZTo6UG9saWN5Q2hlY2tlcjo6Y29udGludWVBZnRlck5ld1dpbmRvd1BvbGljeSk6 IERlbGV0ZWQuCisgICAgICAgICogbG9hZGVyL1BvbGljeUNoZWNrZXIuaDoKKwogMjAxNy0wOC0y MyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IFN0b3AgdXNpbmcgUG9saWN5Q2hlY2tlciBmb3IgQ29udGVudFBvbGljeQpJbmRleDogU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAyMjExMDMpCisrKyBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjk0LDcg KzEyOTQsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkVVJMKEZyYW1lTG9hZFJlcXVlCiAKICAg ICBpZiAoIXRhcmdldEZyYW1lICYmICFmcmFtZU5hbWUuaXNFbXB0eSgpKSB7CiAgICAgICAgIGFj dGlvbiA9IGFjdGlvbi5jb3B5V2l0aFNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3koc2hvdWxk T3BlbkV4dGVybmFsVVJMc1BvbGljeVRvQXBwbHkobV9mcmFtZSwgZnJhbWVMb2FkUmVxdWVzdCkp OwotICAgICAgICBwb2xpY3lDaGVja2VyKCkuY2hlY2tOZXdXaW5kb3dQb2xpY3koYWN0aW9uLCBy ZXF1ZXN0LCBmb3JtU3RhdGUsIGZyYW1lTmFtZSwgW3RoaXMsIGFsbG93TmF2aWdhdGlvblRvSW52 YWxpZFVSTCwgb3BlbmVyUG9saWN5XSAoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBG b3JtU3RhdGUqIGZvcm1TdGF0ZSwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IE5hdmln YXRpb25BY3Rpb24mIGFjdGlvbiwgYm9vbCBzaG91bGRDb250aW51ZSkgeworICAgICAgICBwb2xp Y3lDaGVja2VyKCkuY2hlY2tOZXdXaW5kb3dQb2xpY3koV1RGTW92ZShhY3Rpb24pLCByZXF1ZXN0 LCBmb3JtU3RhdGUsIGZyYW1lTmFtZSwgW3RoaXMsIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVS TCwgb3BlbmVyUG9saWN5XSAoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBGb3JtU3Rh dGUqIGZvcm1TdGF0ZSwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IE5hdmlnYXRpb25B Y3Rpb24mIGFjdGlvbiwgYm9vbCBzaG91bGRDb250aW51ZSkgewogICAgICAgICAgICAgY29udGlu dWVMb2FkQWZ0ZXJOZXdXaW5kb3dQb2xpY3kocmVxdWVzdCwgZm9ybVN0YXRlLCBmcmFtZU5hbWUs IGFjdGlvbiwgc2hvdWxkQ29udGludWUsIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgb3Bl bmVyUG9saWN5KTsKICAgICAgICAgfSk7CiAgICAgICAgIHJldHVybjsKQEAgLTEzNjQsNyArMTM2 NCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWQoRnJhbWVMb2FkUmVxdWVzdCYKIAogICAgIGlm IChyZXF1ZXN0LnNob3VsZENoZWNrTmV3V2luZG93UG9saWN5KCkpIHsKICAgICAgICAgTmF2aWdh dGlvbkFjdGlvbiBhY3Rpb24geyByZXF1ZXN0LnJlcXVlc3RlcigpLCByZXF1ZXN0LnJlc291cmNl UmVxdWVzdCgpLCBJbml0aWF0ZWRCeU1haW5GcmFtZTo6VW5rbm93biwgTmF2aWdhdGlvblR5cGU6 Ok90aGVyLCByZXF1ZXN0LnNob3VsZE9wZW5FeHRlcm5hbFVSTHNQb2xpY3koKSB9OwotICAgICAg ICBwb2xpY3lDaGVja2VyKCkuY2hlY2tOZXdXaW5kb3dQb2xpY3koYWN0aW9uLCByZXF1ZXN0LnJl c291cmNlUmVxdWVzdCgpLCBudWxscHRyLCByZXF1ZXN0LmZyYW1lTmFtZSgpLCBbdGhpc10gKGNv bnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgRm9ybVN0YXRlKiBmb3JtU3RhdGUsIGNvbnN0 IFN0cmluZyYgZnJhbWVOYW1lLCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBhY3Rpb24sIGJvb2wg c2hvdWxkQ29udGludWUpIHsKKyAgICAgICAgcG9saWN5Q2hlY2tlcigpLmNoZWNrTmV3V2luZG93 UG9saWN5KFdURk1vdmUoYWN0aW9uKSwgcmVxdWVzdC5yZXNvdXJjZVJlcXVlc3QoKSwgbnVsbHB0 ciwgcmVxdWVzdC5mcmFtZU5hbWUoKSwgW3RoaXNdIChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QsIEZvcm1TdGF0ZSogZm9ybVN0YXRlLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgY29u c3QgTmF2aWdhdGlvbkFjdGlvbiYgYWN0aW9uLCBib29sIHNob3VsZENvbnRpbnVlKSB7CiAgICAg ICAgICAgICBjb250aW51ZUxvYWRBZnRlck5ld1dpbmRvd1BvbGljeShyZXF1ZXN0LCBmb3JtU3Rh dGUsIGZyYW1lTmFtZSwgYWN0aW9uLCBzaG91bGRDb250aW51ZSwgQWxsb3dOYXZpZ2F0aW9uVG9J bnZhbGlkVVJMOjpZZXMsIE5ld0ZyYW1lT3BlbmVyUG9saWN5OjpTdXBwcmVzcyk7CiAgICAgICAg IH0pOwogCkBAIC0yNzY5LDcgKzI3NjksNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkUG9zdFJl cXVlc3QoRnJhbWVMCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBw b2xpY3lDaGVja2VyKCkuY2hlY2tOZXdXaW5kb3dQb2xpY3koYWN0aW9uLCB3b3JraW5nUmVzb3Vy Y2VSZXF1ZXN0LCBXVEZNb3ZlKGZvcm1TdGF0ZSksIGZyYW1lTmFtZSwgW3RoaXMsIGFsbG93TmF2 aWdhdGlvblRvSW52YWxpZFVSTCwgb3BlbmVyUG9saWN5XSAoY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiByZXF1ZXN0LCBGb3JtU3RhdGUqIGZvcm1TdGF0ZSwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUs IGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIGFjdGlvbiwgYm9vbCBzaG91bGRDb250aW51ZSkgewor ICAgICAgICBwb2xpY3lDaGVja2VyKCkuY2hlY2tOZXdXaW5kb3dQb2xpY3koV1RGTW92ZShhY3Rp b24pLCB3b3JraW5nUmVzb3VyY2VSZXF1ZXN0LCBXVEZNb3ZlKGZvcm1TdGF0ZSksIGZyYW1lTmFt ZSwgW3RoaXMsIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgb3BlbmVyUG9saWN5XSAoY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBGb3JtU3RhdGUqIGZvcm1TdGF0ZSwgY29uc3Qg U3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIGFjdGlvbiwgYm9vbCBz aG91bGRDb250aW51ZSkgewogICAgICAgICAgICAgY29udGludWVMb2FkQWZ0ZXJOZXdXaW5kb3dQ b2xpY3kocmVxdWVzdCwgZm9ybVN0YXRlLCBmcmFtZU5hbWUsIGFjdGlvbiwgc2hvdWxkQ29udGlu dWUsIGFsbG93TmF2aWdhdGlvblRvSW52YWxpZFVSTCwgb3BlbmVyUG9saWN5KTsKICAgICAgICAg fSk7CiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Qb2xpY3lD YWxsYmFjay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1BvbGljeUNh bGxiYWNrLmNwcAkocmV2aXNpb24gMjIxMTAzKQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1Bv bGljeUNhbGxiYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDUsMjYgKzQ1LDEyIEBAIHZvaWQg UG9saWN5Q2FsbGJhY2s6OnNldChjb25zdCBSZXNvdXJjZVIKICAgICBtX2ZyYW1lTmFtZSA9IFN0 cmluZygpOwogCiAgICAgbV9uYXZpZ2F0aW9uRnVuY3Rpb24gPSBXVEZNb3ZlKGZ1bmN0aW9uKTsK LSAgICBtX25ld1dpbmRvd0Z1bmN0aW9uID0gbnVsbHB0cjsKLX0KLQotdm9pZCBQb2xpY3lDYWxs YmFjazo6c2V0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgRm9ybVN0YXRlKiBmb3Jt U3RhdGUsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiBu YXZpZ2F0aW9uQWN0aW9uLCBOZXdXaW5kb3dQb2xpY3lEZWNpc2lvbkZ1bmN0aW9uJiYgZnVuY3Rp b24pCi17Ci0gICAgbV9yZXF1ZXN0ID0gcmVxdWVzdDsKLSAgICBtX2Zvcm1TdGF0ZSA9IGZvcm1T dGF0ZTsKLSAgICBtX2ZyYW1lTmFtZSA9IGZyYW1lTmFtZTsKLSAgICBtX25hdmlnYXRpb25BY3Rp b24gPSBuYXZpZ2F0aW9uQWN0aW9uOwotCi0gICAgbV9uYXZpZ2F0aW9uRnVuY3Rpb24gPSBudWxs cHRyOwotICAgIG1fbmV3V2luZG93RnVuY3Rpb24gPSBXVEZNb3ZlKGZ1bmN0aW9uKTsKIH0KIAog dm9pZCBQb2xpY3lDYWxsYmFjazo6Y2FsbChib29sIHNob3VsZENvbnRpbnVlKQogewogICAgIGlm IChtX25hdmlnYXRpb25GdW5jdGlvbikKICAgICAgICAgbV9uYXZpZ2F0aW9uRnVuY3Rpb24obV9y ZXF1ZXN0LCBtX2Zvcm1TdGF0ZS5nZXQoKSwgc2hvdWxkQ29udGludWUpOwotICAgIGlmIChtX25l d1dpbmRvd0Z1bmN0aW9uKQotICAgICAgICBtX25ld1dpbmRvd0Z1bmN0aW9uKG1fcmVxdWVzdCwg bV9mb3JtU3RhdGUuZ2V0KCksIG1fZnJhbWVOYW1lLCBtX25hdmlnYXRpb25BY3Rpb24sIHNob3Vs ZENvbnRpbnVlKTsKIH0KIAogdm9pZCBQb2xpY3lDYWxsYmFjazo6Y2xlYXJSZXF1ZXN0KCkKQEAg LTc5LDggKzY1LDYgQEAgdm9pZCBQb2xpY3lDYWxsYmFjazo6Y2FuY2VsKCkKICAgICBjbGVhclJl cXVlc3QoKTsKICAgICBpZiAobV9uYXZpZ2F0aW9uRnVuY3Rpb24pCiAgICAgICAgIG1fbmF2aWdh dGlvbkZ1bmN0aW9uKG1fcmVxdWVzdCwgbV9mb3JtU3RhdGUuZ2V0KCksIGZhbHNlKTsKLSAgICBp ZiAobV9uZXdXaW5kb3dGdW5jdGlvbikKLSAgICAgICAgbV9uZXdXaW5kb3dGdW5jdGlvbihtX3Jl cXVlc3QsIG1fZm9ybVN0YXRlLmdldCgpLCBtX2ZyYW1lTmFtZSwgbV9uYXZpZ2F0aW9uQWN0aW9u LCBmYWxzZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2xvYWRlci9Qb2xpY3lDYWxsYmFjay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9Qb2xpY3lDYWxsYmFjay5oCShyZXZpc2lvbiAyMjExMDMpCisrKyBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUG9saWN5Q2FsbGJhY2suaAkod29ya2luZyBjb3B5KQpAQCAtNDIsMTIgKzQy LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEZvcm1TdGF0ZTsKIAogdXNpbmcgTmF2 aWdhdGlvblBvbGljeURlY2lzaW9uRnVuY3Rpb24gPSBGdW5jdGlvbjx2b2lkKGNvbnN0IFJlc291 cmNlUmVxdWVzdCYsIEZvcm1TdGF0ZSosIGJvb2wgc2hvdWxkQ29udGludWUpPjsKLXVzaW5nIE5l d1dpbmRvd1BvbGljeURlY2lzaW9uRnVuY3Rpb24gPSBGdW5jdGlvbjx2b2lkKGNvbnN0IFJlc291 cmNlUmVxdWVzdCYsIEZvcm1TdGF0ZSosIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBjb25zdCBO YXZpZ2F0aW9uQWN0aW9uJiwgYm9vbCBzaG91bGRDb250aW51ZSk+OwogCiBjbGFzcyBQb2xpY3lD YWxsYmFjayB7CiBwdWJsaWM6CiAgICAgdm9pZCBzZXQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0Jiwg Rm9ybVN0YXRlKiwgTmF2aWdhdGlvblBvbGljeURlY2lzaW9uRnVuY3Rpb24mJik7Ci0gICAgdm9p ZCBzZXQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgRm9ybVN0YXRlKiwgY29uc3QgU3RyaW5nJiBm cmFtZU5hbWUsIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mLCBOZXdXaW5kb3dQb2xpY3lEZWNpc2lv bkZ1bmN0aW9uJiYpOwogCiAgICAgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KCkgY29u c3QgeyByZXR1cm4gbV9yZXF1ZXN0OyB9CiAgICAgdm9pZCBjbGVhclJlcXVlc3QoKTsKQEAgLTYy LDcgKzYwLDYgQEAgcHJpdmF0ZToKICAgICBOYXZpZ2F0aW9uQWN0aW9uIG1fbmF2aWdhdGlvbkFj dGlvbjsKIAogICAgIE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbkZ1bmN0aW9uIG1fbmF2aWdhdGlv bkZ1bmN0aW9uOwotICAgIE5ld1dpbmRvd1BvbGljeURlY2lzaW9uRnVuY3Rpb24gbV9uZXdXaW5k b3dGdW5jdGlvbjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2xvYWRlci9Qb2xpY3lDaGVja2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvUG9saWN5Q2hlY2tlci5jcHAJKHJldmlzaW9uIDIyMTEwMykKKysrIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9Qb2xpY3lDaGVja2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTUz LDcgKzE1Myw3IEBAIHZvaWQgUG9saWN5Q2hlY2tlcjo6Y2hlY2tOYXZpZ2F0aW9uUG9saWMKICAg ICBtX2RlbGVnYXRlSXNEZWNpZGluZ05hdmlnYXRpb25Qb2xpY3kgPSBmYWxzZTsKIH0KIAotdm9p ZCBQb2xpY3lDaGVja2VyOjpjaGVja05ld1dpbmRvd1BvbGljeShjb25zdCBOYXZpZ2F0aW9uQWN0 aW9uJiBhY3Rpb24sIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgRm9ybVN0YXRlKiBm b3JtU3RhdGUsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBOZXdXaW5kb3dQb2xpY3lEZWNpc2lv bkZ1bmN0aW9uIGZ1bmN0aW9uKQordm9pZCBQb2xpY3lDaGVja2VyOjpjaGVja05ld1dpbmRvd1Bv bGljeShOYXZpZ2F0aW9uQWN0aW9uJiYgbmF2aWdhdGlvbkFjdGlvbiwgY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBGb3JtU3RhdGUqIGZvcm1TdGF0ZSwgY29uc3QgU3RyaW5nJiBmcmFt ZU5hbWUsIE5ld1dpbmRvd1BvbGljeURlY2lzaW9uRnVuY3Rpb24gZnVuY3Rpb24pCiB7CiAgICAg aWYgKG1fZnJhbWUuZG9jdW1lbnQoKSAmJiBtX2ZyYW1lLmRvY3VtZW50KCktPmlzU2FuZGJveGVk KFNhbmRib3hQb3B1cHMpKQogICAgICAgICByZXR1cm4gY29udGludWVBZnRlck5hdmlnYXRpb25Q b2xpY3koUG9saWN5SWdub3JlKTsKQEAgLTE2MSw5ICsxNjEsMTkgQEAgdm9pZCBQb2xpY3lDaGVj a2VyOjpjaGVja05ld1dpbmRvd1BvbGljeQogICAgIGlmICghRE9NV2luZG93OjphbGxvd1BvcFVw KG1fZnJhbWUpKQogICAgICAgICByZXR1cm4gY29udGludWVBZnRlck5hdmlnYXRpb25Qb2xpY3ko UG9saWN5SWdub3JlKTsKIAotICAgIG1fY2FsbGJhY2suc2V0KHJlcXVlc3QsIGZvcm1TdGF0ZSwg ZnJhbWVOYW1lLCBhY3Rpb24sIFdURk1vdmUoZnVuY3Rpb24pKTsKLSAgICBtX2ZyYW1lLmxvYWRl cigpLmNsaWVudCgpLmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uKGFjdGlv biwgcmVxdWVzdCwgZm9ybVN0YXRlLCBmcmFtZU5hbWUsIFt0aGlzXShQb2xpY3lBY3Rpb24gYWN0 aW9uKSB7Ci0gICAgICAgIGNvbnRpbnVlQWZ0ZXJOZXdXaW5kb3dQb2xpY3koYWN0aW9uKTsKKyAg ICBtX2ZyYW1lLmxvYWRlcigpLmNsaWVudCgpLmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3V2lu ZG93QWN0aW9uKG5hdmlnYXRpb25BY3Rpb24sIHJlcXVlc3QsIGZvcm1TdGF0ZSwgZnJhbWVOYW1l LCBbZnJhbWUgPSBtYWtlUmVmKG1fZnJhbWUpLCByZXF1ZXN0LCBmb3JtU3RhdGUgPSBtYWtlUmVm UHRyKGZvcm1TdGF0ZSksIGZyYW1lTmFtZSwgbmF2aWdhdGlvbkFjdGlvbiwgZnVuY3Rpb24gPSBX VEZNb3ZlKGZ1bmN0aW9uKV0oUG9saWN5QWN0aW9uIHBvbGljeUFjdGlvbikgeworICAgICAgICBz d2l0Y2ggKHBvbGljeUFjdGlvbikgeworICAgICAgICBjYXNlIFBvbGljeURvd25sb2FkOgorICAg ICAgICAgICAgZnJhbWUtPmxvYWRlcigpLmNsaWVudCgpLnN0YXJ0RG93bmxvYWQocmVxdWVzdCk7 CisgICAgICAgICAgICBGQUxMVEhST1VHSDsKKyAgICAgICAgY2FzZSBQb2xpY3lJZ25vcmU6Cisg ICAgICAgICAgICBmdW5jdGlvbih7IH0sIG51bGxwdHIsIHsgfSwgeyB9LCBmYWxzZSk7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBQb2xpY3lVc2U6CisgICAgICAgICAgICBmdW5j dGlvbihyZXF1ZXN0LCBmb3JtU3RhdGUuZ2V0KCksIGZyYW1lTmFtZSwgbmF2aWdhdGlvbkFjdGlv biwgdHJ1ZSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKICAgICB9KTsKIH0KIApAQCAtMjI0LDI1ICsyMzQsNiBAQCB2b2lkIFBv bGljeUNoZWNrZXI6OmNvbnRpbnVlQWZ0ZXJOYXZpZ2F0CiAgICAgY2FsbGJhY2suY2FsbChzaG91 bGRDb250aW51ZSk7CiB9CiAKLXZvaWQgUG9saWN5Q2hlY2tlcjo6Y29udGludWVBZnRlck5ld1dp bmRvd1BvbGljeShQb2xpY3lBY3Rpb24gcG9saWN5KQotewotICAgIFBvbGljeUNhbGxiYWNrIGNh bGxiYWNrID0gV1RGTW92ZShtX2NhbGxiYWNrKTsKLQotICAgIHN3aXRjaCAocG9saWN5KSB7Ci0g ICAgICAgIGNhc2UgUG9saWN5SWdub3JlOgotICAgICAgICAgICAgY2FsbGJhY2suY2xlYXJSZXF1 ZXN0KCk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBQb2xpY3lEb3dubG9hZDoK LSAgICAgICAgICAgIG1fZnJhbWUubG9hZGVyKCkuY2xpZW50KCkuc3RhcnREb3dubG9hZChjYWxs YmFjay5yZXF1ZXN0KCkpOwotICAgICAgICAgICAgY2FsbGJhY2suY2xlYXJSZXF1ZXN0KCk7Ci0g ICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBQb2xpY3lVc2U6Ci0gICAgICAgICAgICBi cmVhazsKLSAgICB9Ci0KLSAgICBjYWxsYmFjay5jYWxsKHBvbGljeSA9PSBQb2xpY3lVc2UpOwot fQotCiB2b2lkIFBvbGljeUNoZWNrZXI6OmhhbmRsZVVuaW1wbGVtZW50YWJsZVBvbGljeShjb25z dCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsKICAgICBtX2RlbGVnYXRlSXNIYW5kbGluZ1VuaW1w bGVtZW50YWJsZVBvbGljeSA9IHRydWU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUG9s aWN5Q2hlY2tlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Qb2xpY3lD aGVja2VyLmgJKHJldmlzaW9uIDIyMTEwMykKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Qb2xp Y3lDaGVja2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDggQEAgY2xhc3MgTmF2aWdh dGlvbkFjdGlvbjsKIGNsYXNzIFJlc291cmNlRXJyb3I7CiBjbGFzcyBSZXNvdXJjZVJlc3BvbnNl OwogCit1c2luZyBOZXdXaW5kb3dQb2xpY3lEZWNpc2lvbkZ1bmN0aW9uID0gV1RGOjpGdW5jdGlv bjx2b2lkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIEZvcm1TdGF0ZSosIGNvbnN0IFN0cmluZyYg ZnJhbWVOYW1lLCBjb25zdCBOYXZpZ2F0aW9uQWN0aW9uJiwgYm9vbCBzaG91bGRDb250aW51ZSk+ OworCiBjbGFzcyBQb2xpY3lDaGVja2VyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShQb2xp Y3lDaGVja2VyKTsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKQEAgLTU1LDcgKzU3LDcg QEAgcHVibGljOgogCiAgICAgdm9pZCBjaGVja05hdmlnYXRpb25Qb2xpY3koY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0JiwgYm9vbCBkaWRSZWNlaXZlUmVkaXJlY3RSZXNwb25zZSwgRG9jdW1lbnRMb2Fk ZXIqLCBGb3JtU3RhdGUqLCBOYXZpZ2F0aW9uUG9saWN5RGVjaXNpb25GdW5jdGlvbik7CiAgICAg dm9pZCBjaGVja05hdmlnYXRpb25Qb2xpY3koY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgYm9vbCBk aWRSZWNlaXZlUmVkaXJlY3RSZXNwb25zZSwgTmF2aWdhdGlvblBvbGljeURlY2lzaW9uRnVuY3Rp b24pOwotICAgIHZvaWQgY2hlY2tOZXdXaW5kb3dQb2xpY3koY29uc3QgTmF2aWdhdGlvbkFjdGlv biYsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIEZvcm1TdGF0ZSosIGNvbnN0IFN0cmluZyYgZnJh bWVOYW1lLCBOZXdXaW5kb3dQb2xpY3lEZWNpc2lvbkZ1bmN0aW9uKTsKKyAgICB2b2lkIGNoZWNr TmV3V2luZG93UG9saWN5KE5hdmlnYXRpb25BY3Rpb24mJiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiwgRm9ybVN0YXRlKiwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIE5ld1dpbmRvd1BvbGljeURl Y2lzaW9uRnVuY3Rpb24pOwogCiAgICAgLy8gRklYTUU6IFRoZXNlIGFyZSBkaWZmZXJlbnQuICBU aGV5IGNvdWxkIHVzZSBiZXR0ZXIgbmFtZXMuCiAgICAgdm9pZCBjYW5jZWxDaGVjaygpOwpAQCAt ODQsNyArODYsNiBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdm9pZCBjb250aW51ZUFmdGVy TmF2aWdhdGlvblBvbGljeShQb2xpY3lBY3Rpb24pOwotICAgIHZvaWQgY29udGludWVBZnRlck5l d1dpbmRvd1BvbGljeShQb2xpY3lBY3Rpb24pOwogCiAgICAgdm9pZCBoYW5kbGVVbmltcGxlbWVu dGFibGVQb2xpY3koY29uc3QgUmVzb3VyY2VFcnJvciYpOwogCg== 318998 2017-08-24 11:10:35 -0700 2017-08-24 14:45:42 -0700 patch patch text/plain 11036 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMTEwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA4LTIzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU3RvcCB1c2lu ZyBQb2xpY3lDYWxsYmFjayBmb3IgbmV3IHdpbmRvdyBwb2xpY2llcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1OTA3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQW5keSBFc3Rlcy4KKworICAgICAgICBQb2xpY3lDYWxsYmFjayBpcyBhbiBhcnRpZmFj dCBmcm9tIHRoZSBkYXlzIGJlZm9yZSBDKysxMS4gIExldCdzIHVzZSBsYW1iZGFzIGluc3RlYWQh CisgICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvdXIuCisKKyAgICAgICAgKiBsb2FkZXIvUG9s aWN5Q2FsbGJhY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UG9saWN5Q2FsbGJhY2s6OnNldCk6 CisgICAgICAgIChXZWJDb3JlOjpQb2xpY3lDYWxsYmFjazo6Y2FsbCk6CisgICAgICAgIChXZWJD b3JlOjpQb2xpY3lDYWxsYmFjazo6Y2FuY2VsKToKKyAgICAgICAgKiBsb2FkZXIvUG9saWN5Q2Fs bGJhY2suaDoKKyAgICAgICAgKiBsb2FkZXIvUG9saWN5Q2hlY2tlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpQb2xpY3lDaGVja2VyOjpjaGVja05ld1dpbmRvd1BvbGljeSk6CisgICAgICAgIChX ZWJDb3JlOjpQb2xpY3lDaGVja2VyOjpjb250aW51ZUFmdGVyTmV3V2luZG93UG9saWN5KTogRGVs ZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvUG9saWN5Q2hlY2tlci5oOgorCiAyMDE3LTA4LTIzICBB bGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU3Rv cCB1c2luZyBQb2xpY3lDaGVja2VyIGZvciBDb250ZW50UG9saWN5CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHJldmlzaW9uIDIyMTEwMykKKysrIFNvdXJjZS9XZWJD b3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyOTQsNyArMTI5 NCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRVUkwoRnJhbWVMb2FkUmVxdWUKIAogICAgIGlm ICghdGFyZ2V0RnJhbWUgJiYgIWZyYW1lTmFtZS5pc0VtcHR5KCkpIHsKICAgICAgICAgYWN0aW9u ID0gYWN0aW9uLmNvcHlXaXRoU2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeShzaG91bGRPcGVu RXh0ZXJuYWxVUkxzUG9saWN5VG9BcHBseShtX2ZyYW1lLCBmcmFtZUxvYWRSZXF1ZXN0KSk7Ci0g ICAgICAgIHBvbGljeUNoZWNrZXIoKS5jaGVja05ld1dpbmRvd1BvbGljeShhY3Rpb24sIHJlcXVl c3QsIGZvcm1TdGF0ZSwgZnJhbWVOYW1lLCBbdGhpcywgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlk VVJMLCBvcGVuZXJQb2xpY3ldIChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEZvcm1T dGF0ZSogZm9ybVN0YXRlLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgY29uc3QgTmF2aWdhdGlv bkFjdGlvbiYgYWN0aW9uLCBib29sIHNob3VsZENvbnRpbnVlKSB7CisgICAgICAgIHBvbGljeUNo ZWNrZXIoKS5jaGVja05ld1dpbmRvd1BvbGljeShXVEZNb3ZlKGFjdGlvbiksIHJlcXVlc3QsIGZv cm1TdGF0ZSwgZnJhbWVOYW1lLCBbdGhpcywgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBv cGVuZXJQb2xpY3ldIChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEZvcm1TdGF0ZSog Zm9ybVN0YXRlLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgY29uc3QgTmF2aWdhdGlvbkFjdGlv biYgYWN0aW9uLCBib29sIHNob3VsZENvbnRpbnVlKSB7CiAgICAgICAgICAgICBjb250aW51ZUxv YWRBZnRlck5ld1dpbmRvd1BvbGljeShyZXF1ZXN0LCBmb3JtU3RhdGUsIGZyYW1lTmFtZSwgYWN0 aW9uLCBzaG91bGRDb250aW51ZSwgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBvcGVuZXJQ b2xpY3kpOwogICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuOwpAQCAtMTM2NCw3ICsxMzY0LDcg QEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZChGcmFtZUxvYWRSZXF1ZXN0JgogCiAgICAgaWYgKHJl cXVlc3Quc2hvdWxkQ2hlY2tOZXdXaW5kb3dQb2xpY3koKSkgewogICAgICAgICBOYXZpZ2F0aW9u QWN0aW9uIGFjdGlvbiB7IHJlcXVlc3QucmVxdWVzdGVyKCksIHJlcXVlc3QucmVzb3VyY2VSZXF1 ZXN0KCksIEluaXRpYXRlZEJ5TWFpbkZyYW1lOjpVbmtub3duLCBOYXZpZ2F0aW9uVHlwZTo6T3Ro ZXIsIHJlcXVlc3Quc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSgpIH07Ci0gICAgICAgIHBv bGljeUNoZWNrZXIoKS5jaGVja05ld1dpbmRvd1BvbGljeShhY3Rpb24sIHJlcXVlc3QucmVzb3Vy Y2VSZXF1ZXN0KCksIG51bGxwdHIsIHJlcXVlc3QuZnJhbWVOYW1lKCksIFt0aGlzXSAoY29uc3Qg UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBGb3JtU3RhdGUqIGZvcm1TdGF0ZSwgY29uc3QgU3Ry aW5nJiBmcmFtZU5hbWUsIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIGFjdGlvbiwgYm9vbCBzaG91 bGRDb250aW51ZSkgeworICAgICAgICBwb2xpY3lDaGVja2VyKCkuY2hlY2tOZXdXaW5kb3dQb2xp Y3koV1RGTW92ZShhY3Rpb24pLCByZXF1ZXN0LnJlc291cmNlUmVxdWVzdCgpLCBudWxscHRyLCBy ZXF1ZXN0LmZyYW1lTmFtZSgpLCBbdGhpc10gKGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVz dCwgRm9ybVN0YXRlKiBmb3JtU3RhdGUsIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBjb25zdCBO YXZpZ2F0aW9uQWN0aW9uJiBhY3Rpb24sIGJvb2wgc2hvdWxkQ29udGludWUpIHsKICAgICAgICAg ICAgIGNvbnRpbnVlTG9hZEFmdGVyTmV3V2luZG93UG9saWN5KHJlcXVlc3QsIGZvcm1TdGF0ZSwg ZnJhbWVOYW1lLCBhY3Rpb24sIHNob3VsZENvbnRpbnVlLCBBbGxvd05hdmlnYXRpb25Ub0ludmFs aWRVUkw6OlllcywgTmV3RnJhbWVPcGVuZXJQb2xpY3k6OlN1cHByZXNzKTsKICAgICAgICAgfSk7 CiAKQEAgLTI3NjksNyArMjc2OSw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmxvYWRQb3N0UmVxdWVz dChGcmFtZUwKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHBvbGlj eUNoZWNrZXIoKS5jaGVja05ld1dpbmRvd1BvbGljeShhY3Rpb24sIHdvcmtpbmdSZXNvdXJjZVJl cXVlc3QsIFdURk1vdmUoZm9ybVN0YXRlKSwgZnJhbWVOYW1lLCBbdGhpcywgYWxsb3dOYXZpZ2F0 aW9uVG9JbnZhbGlkVVJMLCBvcGVuZXJQb2xpY3ldIChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QsIEZvcm1TdGF0ZSogZm9ybVN0YXRlLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFtZSwgY29u c3QgTmF2aWdhdGlvbkFjdGlvbiYgYWN0aW9uLCBib29sIHNob3VsZENvbnRpbnVlKSB7CisgICAg ICAgIHBvbGljeUNoZWNrZXIoKS5jaGVja05ld1dpbmRvd1BvbGljeShXVEZNb3ZlKGFjdGlvbiks IHdvcmtpbmdSZXNvdXJjZVJlcXVlc3QsIFdURk1vdmUoZm9ybVN0YXRlKSwgZnJhbWVOYW1lLCBb dGhpcywgYWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBvcGVuZXJQb2xpY3ldIChjb25zdCBS ZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEZvcm1TdGF0ZSogZm9ybVN0YXRlLCBjb25zdCBTdHJp bmcmIGZyYW1lTmFtZSwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYgYWN0aW9uLCBib29sIHNob3Vs ZENvbnRpbnVlKSB7CiAgICAgICAgICAgICBjb250aW51ZUxvYWRBZnRlck5ld1dpbmRvd1BvbGlj eShyZXF1ZXN0LCBmb3JtU3RhdGUsIGZyYW1lTmFtZSwgYWN0aW9uLCBzaG91bGRDb250aW51ZSwg YWxsb3dOYXZpZ2F0aW9uVG9JbnZhbGlkVVJMLCBvcGVuZXJQb2xpY3kpOwogICAgICAgICB9KTsK ICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1BvbGljeUNhbGxi YWNrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUG9saWN5Q2FsbGJh Y2suY3BwCShyZXZpc2lvbiAyMjExMDMpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUG9saWN5 Q2FsbGJhY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NSwyNiArNDUsMTIgQEAgdm9pZCBQb2xp Y3lDYWxsYmFjazo6c2V0KGNvbnN0IFJlc291cmNlUgogICAgIG1fZnJhbWVOYW1lID0gU3RyaW5n KCk7CiAKICAgICBtX25hdmlnYXRpb25GdW5jdGlvbiA9IFdURk1vdmUoZnVuY3Rpb24pOwotICAg IG1fbmV3V2luZG93RnVuY3Rpb24gPSBudWxscHRyOwotfQotCi12b2lkIFBvbGljeUNhbGxiYWNr OjpzZXQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBGb3JtU3RhdGUqIGZvcm1TdGF0 ZSwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIG5hdmln YXRpb25BY3Rpb24sIE5ld1dpbmRvd1BvbGljeURlY2lzaW9uRnVuY3Rpb24mJiBmdW5jdGlvbikK LXsKLSAgICBtX3JlcXVlc3QgPSByZXF1ZXN0OwotICAgIG1fZm9ybVN0YXRlID0gZm9ybVN0YXRl OwotICAgIG1fZnJhbWVOYW1lID0gZnJhbWVOYW1lOwotICAgIG1fbmF2aWdhdGlvbkFjdGlvbiA9 IG5hdmlnYXRpb25BY3Rpb247Ci0KLSAgICBtX25hdmlnYXRpb25GdW5jdGlvbiA9IG51bGxwdHI7 Ci0gICAgbV9uZXdXaW5kb3dGdW5jdGlvbiA9IFdURk1vdmUoZnVuY3Rpb24pOwogfQogCiB2b2lk IFBvbGljeUNhbGxiYWNrOjpjYWxsKGJvb2wgc2hvdWxkQ29udGludWUpCiB7CiAgICAgaWYgKG1f bmF2aWdhdGlvbkZ1bmN0aW9uKQogICAgICAgICBtX25hdmlnYXRpb25GdW5jdGlvbihtX3JlcXVl c3QsIG1fZm9ybVN0YXRlLmdldCgpLCBzaG91bGRDb250aW51ZSk7Ci0gICAgaWYgKG1fbmV3V2lu ZG93RnVuY3Rpb24pCi0gICAgICAgIG1fbmV3V2luZG93RnVuY3Rpb24obV9yZXF1ZXN0LCBtX2Zv cm1TdGF0ZS5nZXQoKSwgbV9mcmFtZU5hbWUsIG1fbmF2aWdhdGlvbkFjdGlvbiwgc2hvdWxkQ29u dGludWUpOwogfQogCiB2b2lkIFBvbGljeUNhbGxiYWNrOjpjbGVhclJlcXVlc3QoKQpAQCAtNzks OCArNjUsNiBAQCB2b2lkIFBvbGljeUNhbGxiYWNrOjpjYW5jZWwoKQogICAgIGNsZWFyUmVxdWVz dCgpOwogICAgIGlmIChtX25hdmlnYXRpb25GdW5jdGlvbikKICAgICAgICAgbV9uYXZpZ2F0aW9u RnVuY3Rpb24obV9yZXF1ZXN0LCBtX2Zvcm1TdGF0ZS5nZXQoKSwgZmFsc2UpOwotICAgIGlmICht X25ld1dpbmRvd0Z1bmN0aW9uKQotICAgICAgICBtX25ld1dpbmRvd0Z1bmN0aW9uKG1fcmVxdWVz dCwgbV9mb3JtU3RhdGUuZ2V0KCksIG1fZnJhbWVOYW1lLCBtX25hdmlnYXRpb25BY3Rpb24sIGZh bHNlKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL1BvbGljeUNhbGxiYWNrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9h ZGVyL1BvbGljeUNhbGxiYWNrLmgJKHJldmlzaW9uIDIyMTEwMykKKysrIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9Qb2xpY3lDYWxsYmFjay5oCSh3b3JraW5nIGNvcHkpCkBAIC00MiwxMiArNDIsMTAg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgRm9ybVN0YXRlOwogCiB1c2luZyBOYXZpZ2F0 aW9uUG9saWN5RGVjaXNpb25GdW5jdGlvbiA9IEZ1bmN0aW9uPHZvaWQoY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiwgRm9ybVN0YXRlKiwgYm9vbCBzaG91bGRDb250aW51ZSk+OwotdXNpbmcgTmV3V2lu ZG93UG9saWN5RGVjaXNpb25GdW5jdGlvbiA9IEZ1bmN0aW9uPHZvaWQoY29uc3QgUmVzb3VyY2VS ZXF1ZXN0JiwgRm9ybVN0YXRlKiwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIGNvbnN0IE5hdmln YXRpb25BY3Rpb24mLCBib29sIHNob3VsZENvbnRpbnVlKT47CiAKIGNsYXNzIFBvbGljeUNhbGxi YWNrIHsKIHB1YmxpYzoKICAgICB2b2lkIHNldChjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBGb3Jt U3RhdGUqLCBOYXZpZ2F0aW9uUG9saWN5RGVjaXNpb25GdW5jdGlvbiYmKTsKLSAgICB2b2lkIHNl dChjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBGb3JtU3RhdGUqLCBjb25zdCBTdHJpbmcmIGZyYW1l TmFtZSwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYsIE5ld1dpbmRvd1BvbGljeURlY2lzaW9uRnVu Y3Rpb24mJik7CiAKICAgICBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QoKSBjb25zdCB7 IHJldHVybiBtX3JlcXVlc3Q7IH0KICAgICB2b2lkIGNsZWFyUmVxdWVzdCgpOwpAQCAtNjIsNyAr NjAsNiBAQCBwcml2YXRlOgogICAgIE5hdmlnYXRpb25BY3Rpb24gbV9uYXZpZ2F0aW9uQWN0aW9u OwogCiAgICAgTmF2aWdhdGlvblBvbGljeURlY2lzaW9uRnVuY3Rpb24gbV9uYXZpZ2F0aW9uRnVu Y3Rpb247Ci0gICAgTmV3V2luZG93UG9saWN5RGVjaXNpb25GdW5jdGlvbiBtX25ld1dpbmRvd0Z1 bmN0aW9uOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNv cmUvbG9hZGVyL1BvbGljeUNoZWNrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9Qb2xpY3lDaGVja2VyLmNwcAkocmV2aXNpb24gMjIxMTAzKQorKysgU291cmNlL1dl YkNvcmUvbG9hZGVyL1BvbGljeUNoZWNrZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTMsNyAr MTUzLDcgQEAgdm9pZCBQb2xpY3lDaGVja2VyOjpjaGVja05hdmlnYXRpb25Qb2xpYwogICAgIG1f ZGVsZWdhdGVJc0RlY2lkaW5nTmF2aWdhdGlvblBvbGljeSA9IGZhbHNlOwogfQogCi12b2lkIFBv bGljeUNoZWNrZXI6OmNoZWNrTmV3V2luZG93UG9saWN5KGNvbnN0IE5hdmlnYXRpb25BY3Rpb24m IGFjdGlvbiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBGb3JtU3RhdGUqIGZvcm1T dGF0ZSwgY29uc3QgU3RyaW5nJiBmcmFtZU5hbWUsIE5ld1dpbmRvd1BvbGljeURlY2lzaW9uRnVu Y3Rpb24gZnVuY3Rpb24pCit2b2lkIFBvbGljeUNoZWNrZXI6OmNoZWNrTmV3V2luZG93UG9saWN5 KE5hdmlnYXRpb25BY3Rpb24mJiBuYXZpZ2F0aW9uQWN0aW9uLCBjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QsIEZvcm1TdGF0ZSogZm9ybVN0YXRlLCBjb25zdCBTdHJpbmcmIGZyYW1lTmFt ZSwgTmV3V2luZG93UG9saWN5RGVjaXNpb25GdW5jdGlvbiBmdW5jdGlvbikKIHsKICAgICBpZiAo bV9mcmFtZS5kb2N1bWVudCgpICYmIG1fZnJhbWUuZG9jdW1lbnQoKS0+aXNTYW5kYm94ZWQoU2Fu ZGJveFBvcHVwcykpCiAgICAgICAgIHJldHVybiBjb250aW51ZUFmdGVyTmF2aWdhdGlvblBvbGlj eShQb2xpY3lJZ25vcmUpOwpAQCAtMTYxLDkgKzE2MSwxOSBAQCB2b2lkIFBvbGljeUNoZWNrZXI6 OmNoZWNrTmV3V2luZG93UG9saWN5CiAgICAgaWYgKCFET01XaW5kb3c6OmFsbG93UG9wVXAobV9m cmFtZSkpCiAgICAgICAgIHJldHVybiBjb250aW51ZUFmdGVyTmF2aWdhdGlvblBvbGljeShQb2xp Y3lJZ25vcmUpOwogCi0gICAgbV9jYWxsYmFjay5zZXQocmVxdWVzdCwgZm9ybVN0YXRlLCBmcmFt ZU5hbWUsIGFjdGlvbiwgV1RGTW92ZShmdW5jdGlvbikpOwotICAgIG1fZnJhbWUubG9hZGVyKCku Y2xpZW50KCkuZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dBY3Rpb24oYWN0aW9uLCBy ZXF1ZXN0LCBmb3JtU3RhdGUsIGZyYW1lTmFtZSwgW3RoaXNdKFBvbGljeUFjdGlvbiBhY3Rpb24p IHsKLSAgICAgICAgY29udGludWVBZnRlck5ld1dpbmRvd1BvbGljeShhY3Rpb24pOworICAgIG1f ZnJhbWUubG9hZGVyKCkuY2xpZW50KCkuZGlzcGF0Y2hEZWNpZGVQb2xpY3lGb3JOZXdXaW5kb3dB Y3Rpb24obmF2aWdhdGlvbkFjdGlvbiwgcmVxdWVzdCwgZm9ybVN0YXRlLCBmcmFtZU5hbWUsIFtm cmFtZSA9IG1ha2VSZWYobV9mcmFtZSksIHJlcXVlc3QsIGZvcm1TdGF0ZSA9IG1ha2VSZWZQdHIo Zm9ybVN0YXRlKSwgZnJhbWVOYW1lLCBuYXZpZ2F0aW9uQWN0aW9uLCBmdW5jdGlvbiA9IFdURk1v dmUoZnVuY3Rpb24pXShQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKSB7CisgICAgICAgIHN3aXRj aCAocG9saWN5QWN0aW9uKSB7CisgICAgICAgIGNhc2UgUG9saWN5RG93bmxvYWQ6CisgICAgICAg ICAgICBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkuc3RhcnREb3dubG9hZChyZXF1ZXN0KTsKKyAg ICAgICAgICAgIEZBTExUSFJPVUdIOworICAgICAgICBjYXNlIFBvbGljeUlnbm9yZToKKyAgICAg ICAgICAgIGZ1bmN0aW9uKHsgfSwgbnVsbHB0ciwgeyB9LCB7IH0sIGZhbHNlKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgY2FzZSBQb2xpY3lVc2U6CisgICAgICAgICAgICBmdW5jdGlv bihyZXF1ZXN0LCBmb3JtU3RhdGUuZ2V0KCksIGZyYW1lTmFtZSwgbmF2aWdhdGlvbkFjdGlvbiwg dHJ1ZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CiAgICAgfSk7CiB9CiAKQEAgLTIyNCwyNSArMjM0LDYgQEAgdm9pZCBQb2xp Y3lDaGVja2VyOjpjb250aW51ZUFmdGVyTmF2aWdhdAogICAgIGNhbGxiYWNrLmNhbGwoc2hvdWxk Q29udGludWUpOwogfQogCi12b2lkIFBvbGljeUNoZWNrZXI6OmNvbnRpbnVlQWZ0ZXJOZXdXaW5k b3dQb2xpY3koUG9saWN5QWN0aW9uIHBvbGljeSkKLXsKLSAgICBQb2xpY3lDYWxsYmFjayBjYWxs YmFjayA9IFdURk1vdmUobV9jYWxsYmFjayk7Ci0KLSAgICBzd2l0Y2ggKHBvbGljeSkgewotICAg ICAgICBjYXNlIFBvbGljeUlnbm9yZToKLSAgICAgICAgICAgIGNhbGxiYWNrLmNsZWFyUmVxdWVz dCgpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgUG9saWN5RG93bmxvYWQ6Ci0g ICAgICAgICAgICBtX2ZyYW1lLmxvYWRlcigpLmNsaWVudCgpLnN0YXJ0RG93bmxvYWQoY2FsbGJh Y2sucmVxdWVzdCgpKTsKLSAgICAgICAgICAgIGNhbGxiYWNrLmNsZWFyUmVxdWVzdCgpOwotICAg ICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNhc2UgUG9saWN5VXNlOgotICAgICAgICAgICAgYnJl YWs7Ci0gICAgfQotCi0gICAgY2FsbGJhY2suY2FsbChwb2xpY3kgPT0gUG9saWN5VXNlKTsKLX0K LQogdm9pZCBQb2xpY3lDaGVja2VyOjpoYW5kbGVVbmltcGxlbWVudGFibGVQb2xpY3koY29uc3Qg UmVzb3VyY2VFcnJvciYgZXJyb3IpCiB7CiAgICAgbV9kZWxlZ2F0ZUlzSGFuZGxpbmdVbmltcGxl bWVudGFibGVQb2xpY3kgPSB0cnVlOwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1BvbGlj eUNoZWNrZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUG9saWN5Q2hl Y2tlci5oCShyZXZpc2lvbiAyMjExMDMpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUG9saWN5 Q2hlY2tlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0Nyw4IEBAIGNsYXNzIE5hdmlnYXRp b25BY3Rpb247CiBjbGFzcyBSZXNvdXJjZUVycm9yOwogY2xhc3MgUmVzb3VyY2VSZXNwb25zZTsK IAordXNpbmcgTmV3V2luZG93UG9saWN5RGVjaXNpb25GdW5jdGlvbiA9IFdURjo6RnVuY3Rpb248 dm9pZChjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBGb3JtU3RhdGUqLCBjb25zdCBTdHJpbmcmIGZy YW1lTmFtZSwgY29uc3QgTmF2aWdhdGlvbkFjdGlvbiYsIGJvb2wgc2hvdWxkQ29udGludWUpPjsK KwogY2xhc3MgUG9saWN5Q2hlY2tlciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoUG9saWN5 Q2hlY2tlcik7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CkBAIC01NSw3ICs1Nyw3IEBA IHB1YmxpYzoKIAogICAgIHZvaWQgY2hlY2tOYXZpZ2F0aW9uUG9saWN5KGNvbnN0IFJlc291cmNl UmVxdWVzdCYsIGJvb2wgZGlkUmVjZWl2ZVJlZGlyZWN0UmVzcG9uc2UsIERvY3VtZW50TG9hZGVy KiwgRm9ybVN0YXRlKiwgTmF2aWdhdGlvblBvbGljeURlY2lzaW9uRnVuY3Rpb24pOwogICAgIHZv aWQgY2hlY2tOYXZpZ2F0aW9uUG9saWN5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIGJvb2wgZGlk UmVjZWl2ZVJlZGlyZWN0UmVzcG9uc2UsIE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbkZ1bmN0aW9u KTsKLSAgICB2b2lkIGNoZWNrTmV3V2luZG93UG9saWN5KGNvbnN0IE5hdmlnYXRpb25BY3Rpb24m LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBGb3JtU3RhdGUqLCBjb25zdCBTdHJpbmcmIGZyYW1l TmFtZSwgTmV3V2luZG93UG9saWN5RGVjaXNpb25GdW5jdGlvbik7CisgICAgdm9pZCBjaGVja05l d1dpbmRvd1BvbGljeShOYXZpZ2F0aW9uQWN0aW9uJiYsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYs IEZvcm1TdGF0ZSosIGNvbnN0IFN0cmluZyYgZnJhbWVOYW1lLCBOZXdXaW5kb3dQb2xpY3lEZWNp c2lvbkZ1bmN0aW9uKTsKIAogICAgIC8vIEZJWE1FOiBUaGVzZSBhcmUgZGlmZmVyZW50LiAgVGhl eSBjb3VsZCB1c2UgYmV0dGVyIG5hbWVzLgogICAgIHZvaWQgY2FuY2VsQ2hlY2soKTsKQEAgLTg0 LDcgKzg2LDYgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIHZvaWQgY29udGludWVBZnRlck5h dmlnYXRpb25Qb2xpY3koUG9saWN5QWN0aW9uKTsKLSAgICB2b2lkIGNvbnRpbnVlQWZ0ZXJOZXdX aW5kb3dQb2xpY3koUG9saWN5QWN0aW9uKTsKIAogICAgIHZvaWQgaGFuZGxlVW5pbXBsZW1lbnRh YmxlUG9saWN5KGNvbnN0IFJlc291cmNlRXJyb3ImKTsKIAo=