163456 2016-10-14 11:31:27 -0700 prepare-ChangeLog erroneously said that a python __init__ method was deleted 2016-10-16 20:06:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser dbates dbates lforschler mcatanzaro simon.fraser oldest_to_newest 1240368 0 simon.fraser 2016-10-14 11:31:27 -0700 The patch in https://bugs.webkit.org/attachment.cgi?id=291568 shows: + (Reviewer.__init__): Deleted. even though that patch did not delete it. 1240455 1 291676 dbates 2016-10-14 16:02:42 -0700 Created attachment 291676 Patch and unit tests 1240648 2 291676 dbates 2016-10-15 15:06:48 -0700 Comment on attachment 291676 Patch and unit tests Clearing flags on attachment: 291676 Committed r207382: <http://trac.webkit.org/changeset/207382> 1240649 3 dbates 2016-10-15 15:06:54 -0700 All reviewed patches have been landed. Closing bug. 1240815 4 mcatanzaro 2016-10-16 17:05:58 -0700 It introduced a Perl warning, can you fix it please? "my" variable @afterChangeFunctionRanges masks earlier declaration in same scope at /home/mcatanzaro/src/WebKit/Tools/Scripts/prepare-ChangeLog line 359. 1240860 5 dbates 2016-10-16 20:06:16 -0700 (In reply to comment #4) > It introduced a Perl warning, can you fix it please? > > "my" variable @afterChangeFunctionRanges masks earlier declaration in same > scope at /home/mcatanzaro/src/WebKit/Tools/Scripts/prepare-ChangeLog line > 359. Fixed in <http://trac.webkit.org/changeset/207399>. 291676 2016-10-14 16:02:42 -0700 2016-10-15 15:06:48 -0700 Patch and unit tests bug-163456-20161014155914.patch text/plain 11020 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3MzQ0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2RiNDk1OTJlMDg1ZWZmOTYxNzMzODBhZWJhZmYwY2Zj MTk3NDkyYy4uMDJkNzAyNDE4Yjc0Mzk0Yjc3YTJhZTI5MTZmNWYxOTBlZTk4YTRkOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDE2LTEwLTE0ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAg ICAgICBwcmVwYXJlLUNoYW5nZUxvZyBlcnJvbmVvdXNseSBzYWlkIHRoYXQgYSBweXRob24gX19p bml0X18gbWV0aG9kIHdhcyBkZWxldGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNjM0NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBGaXhlcyBhbiBpc3N1ZSB3aGVyZSBwcmVwYXJlLUNoYW5nZUxvZyBt YXkgbGlzdCBhcyBkZWxldGVkIGZ1bmN0aW9ucyB0aGF0IGFyZQorICAgICAgICBpbW1lZGlhdGVs eSBhYm92ZSBhZGRlZCBjb2RlLgorCisgICAgICAgIEN1cnJlbnRseSBwcmVwYXJlLUNoYW5nZUxv ZyBtYWtlcyB1c2Ugb2YgdGhlIHNhbWUgb3ZlcmxhcCBkZXRlY3Rpb24gYWxnb3JpdGhtCisgICAg ICAgIHRvIGNvbXB1dGUgdGhlIGxpc3Qgb2YgZGVsZXRlZCBmdW5jdGlvbnMgYXMgaXQgZG9lcyB0 byBjb21wdXRlIGFkZGVkIGFuZCBtb2RpZmllZAorICAgICAgICBmdW5jdGlvbnMuIFdlIGNvbnNp ZGVyIGEgZnVuY3Rpb24gZGVsZXRlZCBpZiBpdHMgZW50aXJlIGZ1bmN0aW9uIGJvZHkgYW5kIHNp Z25hdHVyZQorICAgICAgICBhcmUgcmVtb3ZlZC4gSXQgaXMgc3VmZmljaWVudCB0byBjb21wYXJl IHRoZSBsaXN0IG9mIGZ1bmN0aW9ucyBiZWZvcmUgdGhlIHBhdGNoCisgICAgICAgIGlzIGFwcGxp ZWQgYW5kIHRoZSBsaXN0IG9mIGZ1bmN0aW9ucyBhcmUgdGhlIHBhdGNoIGlzIGFwcGxpZWQgdG8g aWRlbnRpZnkKKyAgICAgICAgdGhlc2UgZnVuY3Rpb25zLgorCisgICAgICAgICogU2NyaXB0cy9w cmVwYXJlLUNoYW5nZUxvZzogRml4IHNvbWUgc3R5bGUgbml0cywgaW5jbHVkaW5nIHVzaW5nIENh bWVsIENhc2UgZm9yCisgICAgICAgIHZhcmlhYmxlIG5hbWVzLgorICAgICAgICAoYWN0dWFsbHlH ZW5lcmF0ZUZ1bmN0aW9uTGlzdHMpOiBNb2RpZmllZCB0byBjYWxsIGNvbXB1dGVNb2RpZmllZEZ1 bmN0aW9ucygpLiBBbHdheXMKKyAgICAgICAgY29tcHV0ZSB0aGUgbGlzdCBvZiBmdW5jdGlvbnMg aW4gdGhlIGZpbGUgYWZ0ZXIgdGhlIHBhdGNoIHJlZ2FyZGxlc3Mgb2Ygd2hldGhlciB0aGUKKyAg ICAgICAgcGF0Y2ggb25seSBjb250YWlucyBkZWxldGlvbnMuIFdlIHdpbGwgY29tcGFyZSB0aGlz IGxpc3QgYWdhaW5zdCB0aGUgbGlzdCBvZiBmdW5jdGlvbnMKKyAgICAgICAgYmVmb3JlIHRoZSBw YXRjaCB3YXMgYXBwbGllZCB0byBkZXRlcm1pbmUgdGhlIGRlbGV0ZWQgZnVuY3Rpb25zLgorICAg ICAgICAoY29tcHV0ZU1vZGlmaWVkRnVuY3Rpb25zKTogUmVuYW1lZDsgZm9ybWVybHkgbmFtZWQg Z2VuZXJhdGVGdW5jdGlvbkxpc3RzQnlSYW5nZXMuCisgICAgICAgIFJlbW92ZWQgb3V0IGFyZ3Vt ZW50IGZvciB0aGUgc2VlbiBmdW5jdGlvbnMgYXMgd2Ugbm8gbG9uZ2VyIG1ha2UgdXNlIG9mIHdo ZW4gY29tcHV0aW5nCisgICAgICAgIHRoZSBsaXN0IG9mIGRlbGV0ZWQgZnVuY3Rpb25zLgorICAg ICAgICAoZGlmZkNvbW1hbmQpOiBVcGRhdGUgY29tbWVudC4KKyAgICAgICAgKGdlbmVyYXRlRnVu Y3Rpb25MaXN0c0J5UmFuZ2VzKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBl cmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5pdHRlc3QvZ2VuZXJhdGVGdW5jdGlvbkxpc3RzLnBsOiBB ZGRlZCBtb3JlIHVuaXQgdGVzdHMuCisKIDIwMTYtMTAtMTQgIENvbW1pdCBRdWV1ZSAgPGNvbW1p dC1xdWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIy MDczMzUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nIGIvVG9v bHMvU2NyaXB0cy9wcmVwYXJlLUNoYW5nZUxvZwppbmRleCBmMmU3YTU2ZjE2ODYzOTc2MWUzODgz YjU1YjcxNzJhM2QzYWFiNWY2Li5jMjM2MTRiOGM1YjM4NDUyYmMxZTZiYTcxYmEwYTgzYjU1ZGQ2 MjM3IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKQEAgLTY5LDYgKzY5LDcgQEAgc3ViIGF0dHJp YnV0ZUNvbW1hbmQoJCQpOwogc3ViIGNoYW5nZUxvZ0RhdGUoJCk7CiBzdWIgY2hhbmdlTG9nRW1h aWxBZGRyZXNzRnJvbUFyZ3MoJCQpOwogc3ViIGNoYW5nZUxvZ05hbWVGcm9tQXJncygkJCk7Citz dWIgY29tcHV0ZU1vZGlmaWVkRnVuY3Rpb25zKCQkJCk7CiBzdWIgY3JlYXRlUGF0Y2hDb21tYW5k KCQkJCQpOwogc3ViIGRlY29kZUVudGl0aWVzKCQpOwogc3ViIGRldGVybWluZVByb3BlcnR5Q2hh bmdlcygkJCQpOwpAQCAtODMsNyArODQsNiBAQCBzdWIgZmluZENoYW5nZUxvZ3MoJCQpOwogc3Vi IGZpbmRPcmlnaW5hbEZpbGVGcm9tU3ZuKCQpOwogc3ViIGdlbmVyYXRlRmlsZUxpc3QoXCUkJCQp Owogc3ViIGdlbmVyYXRlRnVuY3Rpb25MaXN0cygkJCQkJCk7Ci1zdWIgZ2VuZXJhdGVGdW5jdGlv bkxpc3RzQnlSYW5nZXMoJCQkJCk7CiBzdWIgZ2VuZXJhdGVOZXdDaGFuZ2VMb2dzKCQkJCQkJCQk JCQkJCQkKTsKIHN1YiBnZXRMYXRlc3RDaGFuZ2VMb2dzKCQpOwogc3ViIGdldF9mdW5jdGlvbl9s aW5lX3JhbmdlcygkJCk7CkBAIC0zNDksMTYgKzM0OSwyMCBAQCBzdWIgYWN0dWFsbHlHZW5lcmF0 ZUZ1bmN0aW9uTGlzdHMoJCQkJCQkKQogICAgICAgICAjIGFuZCBvdGhlciBjb2RlIGRvZXNuJ3Qg ZXhwZWN0IHRvIHNlZSBhIHRyYWlsaW5nICIgY2hhcmFjdGVyIHdoZW4gc25pZmZpbmcgYSBmaWxl IGV4dGVuc2lvbi4KICAgICAgICAgY2hvbXAgJGZpbGU7CiAgICAgICAgICRmaWxlID1+IHMvIC9c XCAvZzsKKwogICAgICAgICBteSAlc2F3X2Z1bmN0aW9uOworICAgICAgICBteSBAYWZ0ZXJDaGFu Z2VGdW5jdGlvblJhbmdlczsKKwogICAgICAgICAjIEZpbmQgYWxsIHRoZSBmdW5jdGlvbnMgaW4g dGhlIGZpbGUuCi0gICAgICAgIGlmICgkbGluZV9yYW5nZXNfYWZ0ZXJfY2hhbmdlZHskZmlsZX0p IHsKLSAgICAgICAgICAgIG15ICRzb3VyY2VGaWxlSGFuZGxlID0gJGRlbGVnYXRlSGFzaFJlZi0+ e29wZW5GaWxlfSgkZmlsZSk7Ci0gICAgICAgICAgICBuZXh0IHVubGVzcyAkc291cmNlRmlsZUhh bmRsZTsKLSAgICAgICAgICAgIG15IEBmdW5jdGlvbl9yYW5nZXMgPSBnZXRfZnVuY3Rpb25fbGlu ZV9yYW5nZXMoJHNvdXJjZUZpbGVIYW5kbGUsICRmaWxlKTsKLSAgICAgICAgICAgIGNsb3NlKCRz b3VyY2VGaWxlSGFuZGxlKTsKKyAgICAgICAgbXkgJHNvdXJjZUZpbGVIYW5kbGUgPSAkZGVsZWdh dGVIYXNoUmVmLT57b3BlbkZpbGV9KCRmaWxlKTsKKyAgICAgICAgbmV4dCB1bmxlc3MgJHNvdXJj ZUZpbGVIYW5kbGU7CisgICAgICAgIG15IEBhZnRlckNoYW5nZUZ1bmN0aW9uUmFuZ2VzID0gZ2V0 X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzKCRzb3VyY2VGaWxlSGFuZGxlLCAkZmlsZSk7CisgICAgICAg IGNsb3NlKCRzb3VyY2VGaWxlSGFuZGxlKTsKIAorICAgICAgICAjIEZpbmQgbW9kaWZpZWQgZnVu Y3Rpb25zIGluIHRoZSBmaWxlLgorICAgICAgICBpZiAoJGxpbmVfcmFuZ2VzX2FmdGVyX2NoYW5n ZWR7JGZpbGV9KSB7CiAgICAgICAgICAgICBteSBAY2hhbmdlX3JhbmdlcyA9IChAeyRsaW5lX3Jh bmdlc19hZnRlcl9jaGFuZ2VkeyRmaWxlfX0sIFtdKTsKLSAgICAgICAgICAgIG15IEBmdW5jdGlv bnMgPSBnZW5lcmF0ZUZ1bmN0aW9uTGlzdHNCeVJhbmdlcygkZmlsZSwgXEBjaGFuZ2VfcmFuZ2Vz LCBcQGZ1bmN0aW9uX3JhbmdlcywgXCVzYXdfZnVuY3Rpb24pOworICAgICAgICAgICAgbXkgQGZ1 bmN0aW9ucyA9IGNvbXB1dGVNb2RpZmllZEZ1bmN0aW9ucygkZmlsZSwgXEBjaGFuZ2VfcmFuZ2Vz LCBcQGFmdGVyQ2hhbmdlRnVuY3Rpb25SYW5nZXMpOwogCiAgICAgICAgICAgICAjIEZvcm1hdCB0 aGUgbGlzdCBvZiBmdW5jdGlvbnMuCiAgICAgICAgICAgICBpZiAoQGZ1bmN0aW9ucykgewpAQCAt MzcwLDExICszNzQsMjAgQEAgc3ViIGFjdHVhbGx5R2VuZXJhdGVGdW5jdGlvbkxpc3RzKCQkJCQk JCkKICAgICAgICAgaWYgKCRsaW5lX3Jhbmdlc19iZWZvcmVfY2hhbmdlZHskZmlsZX0pIHsKICAg ICAgICAgICAgIG15ICRvcmlnaW5hbEZpbGVIYW5kbGUgPSAkZGVsZWdhdGVIYXNoUmVmLT57b3Bl bk9yaWdpbmFsRmlsZX0oJGZpbGUsICRnaXRDb21taXQsICRnaXRJbmRleCwgJG1lcmdlQmFzZSk7 CiAgICAgICAgICAgICBuZXh0IHVubGVzcyAkb3JpZ2luYWxGaWxlSGFuZGxlOwotICAgICAgICAg ICAgbXkgQGRlbGV0ZWRfZnVuY3Rpb25fcmFuZ2VzID0gZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2Vz KCRvcmlnaW5hbEZpbGVIYW5kbGUsICRmaWxlKTsKKyAgICAgICAgICAgIG15IEBiZWZvcmVDaGFu Z2VGdW5jdGlvblJhbmdlcyA9IGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlcygkb3JpZ2luYWxGaWxl SGFuZGxlLCAkZmlsZSk7CiAgICAgICAgICAgICBjbG9zZSgkb3JpZ2luYWxGaWxlSGFuZGxlKTsK IAotICAgICAgICAgICAgbXkgQGNoYW5nZV9yYW5nZXMgPSAoQHskbGluZV9yYW5nZXNfYmVmb3Jl X2NoYW5nZWR7JGZpbGV9fSwgW10pOwotICAgICAgICAgICAgbXkgQGZ1bmN0aW9ucyA9IGdlbmVy YXRlRnVuY3Rpb25MaXN0c0J5UmFuZ2VzKCRmaWxlLCBcQGNoYW5nZV9yYW5nZXMsIFxAZGVsZXRl ZF9mdW5jdGlvbl9yYW5nZXMsIFwlc2F3X2Z1bmN0aW9uKTsKKyAgICAgICAgICAgIG15ICVleGlz dHNBZnRlckNoYW5nZSA9IG1hcCB7ICRfLT5bMl0gPT4gMSB9IEBhZnRlckNoYW5nZUZ1bmN0aW9u UmFuZ2VzOworCisgICAgICAgICAgICBteSBAZnVuY3Rpb25zOworICAgICAgICAgICAgbXkgJXNh d0Z1bmN0aW9uczsKKyAgICAgICAgICAgIGZvciBteSAkZnVuY3Rpb25SYW5nZSAoQGJlZm9yZUNo YW5nZUZ1bmN0aW9uUmFuZ2VzKSB7CisgICAgICAgICAgICAgICAgbXkgJGZ1bmN0aW9uTmFtZSA9 ICRmdW5jdGlvblJhbmdlLT5bMl07CisgICAgICAgICAgICAgICAgaWYgKCEkZXhpc3RzQWZ0ZXJD aGFuZ2V7JGZ1bmN0aW9uTmFtZX0gJiYgISRzYXdGdW5jdGlvbnN7JGZ1bmN0aW9uTmFtZX0pIHsK KyAgICAgICAgICAgICAgICAgICAgcHVzaCBAZnVuY3Rpb25zLCAkZnVuY3Rpb25OYW1lOworICAg ICAgICAgICAgICAgICAgICAkc2F3RnVuY3Rpb25zeyRmdW5jdGlvbk5hbWV9ID0gMTsKKyAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICMgRm9ybWF0IHRoZSBs aXN0IG9mIGRlbGV0ZWQgZnVuY3Rpb25zLgogICAgICAgICAgICAgaWYgKEBmdW5jdGlvbnMpIHsK QEAgLTM4NSwxNSArMzk4LDE3IEBAIHN1YiBhY3R1YWxseUdlbmVyYXRlRnVuY3Rpb25MaXN0cygk JCQkJCQpCiAgICAgfQogfQogCi1zdWIgZ2VuZXJhdGVGdW5jdGlvbkxpc3RzQnlSYW5nZXMoJCQk JCkKK3N1YiBjb21wdXRlTW9kaWZpZWRGdW5jdGlvbnMoJCQkKQogewotICAgIG15ICgkZmlsZSwg JGNoYW5nZWRfbGluZV9yYW5nZXMsICRmdW5jdGlvbl9yYW5nZXMsICRzYXdfZnVuY3Rpb24pID0g QF87CisgICAgbXkgKCRmaWxlLCAkY2hhbmdlZExpbmVSYW5nZXMsICRmdW5jdGlvblJhbmdlcykg PSBAXzsKKworICAgIG15ICVzYXdGdW5jdGlvbjsKIAogICAgICMgRmluZCBhbGwgdGhlIG1vZGlm aWVkIGZ1bmN0aW9ucy4KICAgICBteSBAZnVuY3Rpb25zOwotICAgIG15IEBjaGFuZ2VfcmFuZ2Vz ID0gQHskY2hhbmdlZF9saW5lX3Jhbmdlc307CisgICAgbXkgQGNoYW5nZV9yYW5nZXMgPSBAeyRj aGFuZ2VkTGluZVJhbmdlc307CiAgICAgbXkgQGNoYW5nZV9yYW5nZSA9ICgwLCAwKTsKLSAgICBG VU5DVElPTjogZm9yZWFjaCBteSAkZnVuY3Rpb25fcmFuZ2VfcmVmIChAeyRmdW5jdGlvbl9yYW5n ZXN9KSB7CisgICAgRlVOQ1RJT046IGZvcmVhY2ggbXkgJGZ1bmN0aW9uX3JhbmdlX3JlZiAoQHsk ZnVuY3Rpb25SYW5nZXN9KSB7CiAgICAgICAgIG15IEBmdW5jdGlvbl9yYW5nZSA9IEB7JGZ1bmN0 aW9uX3JhbmdlX3JlZn07CiAKICAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBhIGhhY2suIElmIHRo ZSBmdW5jdGlvbiBuYW1lIGlzIGVtcHR5LCBza2lwIGl0LgpAQCAtNDE0LDggKzQyOSw4IEBAIHN1 YiBnZW5lcmF0ZUZ1bmN0aW9uTGlzdHNCeVJhbmdlcygkJCQkKQogICAgICAgICAgICAgIyBJZiBh biBvdmVybGFwIHdpdGggdGhpcyBmdW5jdGlvbiByYW5nZSwgcmVjb3JkIHRoZSBmdW5jdGlvbiBu YW1lLgogICAgICAgICAgICAgaWYgKCRjaGFuZ2VfcmFuZ2VbMV0gPj0gJGZ1bmN0aW9uX3Jhbmdl WzBdCiAgICAgICAgICAgICAgICAgYW5kICRjaGFuZ2VfcmFuZ2VbMF0gPD0gJGZ1bmN0aW9uX3Jh bmdlWzFdKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCEkc2F3X2Z1bmN0aW9uLT57JGZ1bmN0aW9u X3JhbmdlWzJdfSkgewotICAgICAgICAgICAgICAgICAgICAkc2F3X2Z1bmN0aW9uLT57JGZ1bmN0 aW9uX3JhbmdlWzJdfSA9IDE7CisgICAgICAgICAgICAgICAgaWYgKCEkc2F3RnVuY3Rpb257JGZ1 bmN0aW9uX3JhbmdlWzJdfSkgeworICAgICAgICAgICAgICAgICAgICAkc2F3RnVuY3Rpb257JGZ1 bmN0aW9uX3JhbmdlWzJdfSA9IDE7CiAgICAgICAgICAgICAgICAgICAgIHB1c2ggQGZ1bmN0aW9u cywgJGZ1bmN0aW9uX3JhbmdlWzJdOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICBuZXh0IEZVTkNUSU9OOwpAQCAtMTk5Niw3ICsyMDExLDcgQEAgc3ViIGRpZmZDb21tYW5kKCQk JCQpCiB7CiAgICAgbXkgKCRwYXRocywgJGdpdENvbW1pdCwgJGdpdEluZGV4LCAkbWVyZ2VCYXNl KSA9IEBfOwogCi0gICAgIyBUaGUgZnVuY3Rpb24gb3ZlcmxhcCBkZXRlY3Rpb24gbG9naWMgaW4g Z2VuZXJhdGVGdW5jdGlvbkxpc3RzQnlSYW5nZXMoKSBhc3N1bWVzIHRoYXQgaXRzIGxpbmUKKyAg ICAjIFRoZSBmdW5jdGlvbiBvdmVybGFwIGRldGVjdGlvbiBsb2dpYyBpbiBjb21wdXRlTW9kaWZp ZWRGdW5jdGlvbnMoKSBhc3N1bWVzIHRoYXQgaXRzIGxpbmUKICAgICAjIHJhbmdlcyB3ZXJlIGZy b20gYSB1bmlmaWVkIGRpZmYgd2l0aG91dCBhbnkgY29udGV4dCBsaW5lcy4KICAgICBteSAkY29t bWFuZDsKICAgICBpZiAoaXNTVk4oKSkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRwZXJsL3ByZXBhcmUtQ2hhbmdlTG9nX3VuaXR0ZXN0L2dlbmVyYXRlRnVuY3Rpb25MaXN0cy5w bCBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9wcmVwYXJlLUNoYW5nZUxvZ191bml0dGVzdC9n ZW5lcmF0ZUZ1bmN0aW9uTGlzdHMucGwKaW5kZXggOWQ4ZTk2ZjFjNjlhY2QwZGE3ODQ2OGQ2Nzk0 NmI5YTQyY2QwMjZmMi4uMDgwZjkyYTBiNjI0Zjg5ZWQ4ZGFkNzZiYjQwNWM4NWVlNTM3MGFhOSAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL3ByZXBhcmUtQ2hhbmdlTG9nX3Vu aXR0ZXN0L2dlbmVyYXRlRnVuY3Rpb25MaXN0cy5wbAorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHBlcmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5pdHRlc3QvZ2VuZXJhdGVGdW5jdGlvbkxpc3RzLnBs CkBAIC03NSw2ICs3NSwyMCBAQCBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltd KQogfQogRU9GCiAKK215ICRFWEFNUExFX0pBVkFTQ1JJUFRfV0lUSF9TQU1FX0ZVTkNUSU9OX0RF RklORURfVFdJQ0UgPSA8PEVPRjsKK2Z1bmN0aW9uIGYoKSB7CisgICAgcmV0dXJuIDU7Cit9CisK K2Z1bmN0aW9uIGYoKSB7CisgICAgcmV0dXJuIDY7Cit9CisKK2Z1bmN0aW9uIGcoKSB7CisgICAg cmV0dXJuIDc7Cit9CitFT0YKKwogbXkgQHRlc3RDYXNlSGFzaFJlZnMgPSAoCiAjIyMKICMgMCBs aW5lcyBvZiBjb250ZXh0CkBAIC0xNDgsNiArMTYyLDEzMSBAQCBFT0YKIEVPRgogfSwKIHsKKyAg ICB0ZXN0TmFtZSA9PiAiVW5pZmllZCBkaWZmIHdpdGggMCBjb250ZXh0OyBhZGQgZnVuY3Rpb24g aW1tZWRpYXRlbHkgYWZ0ZXIgYW5vdGhlciBmdW5jdGlvbiIsCisgICAgaW5wdXRUZXh0ID0+ICRF WEFNUExFX0NQUCwKKyAgICBkaWZmVG9BcHBseSA9PiA8PEVPRiwKK2RpZmYgLS1naXQgYS9maWIu Y3BwIGIvZmliLmNwcAorLS0tIGEvZmliLmNwcAorKysrIGIvZmliLmNwcAorQEAgLTExLDAgKzEy LDQgQEAgdW5zaWduZWQgZmliUGx1c0ZpdmUodW5zaWduZWQgbikKKyt1bnNpZ25lZCBmaWJQbHVz U2V2ZW4odW5zaWduZWQgbikKKyt7CisrICAgIHJldHVybiBmaWIobikgKyA3OworK30KK0VPRgor ICAgIGV4cGVjdGVkID0+IDw8RU9GCisKKyAgICAgICAgKGZpYlBsdXNTZXZlbik6CitFT0YKK30s Cit7CisgICAgdGVzdE5hbWUgPT4gIlVuaWZpZWQgZGlmZiB3aXRoIDAgY29udGV4dDsgYWRkIGZ1 bmN0aW9uIGF0IHRoZSBlbmQgb2YgdGhlIGZpbGUiLAorICAgIGlucHV0VGV4dCA9PiAkRVhBTVBM RV9DUFAsCisgICAgZGlmZlRvQXBwbHkgPT4gPDxFT0YsCitkaWZmIC0tZ2l0IGEvZmliLmNwcCBi L2ZpYi5jcHAKKy0tLSBhL2ZpYi5jcHAKKysrKyBiL2ZpYi5jcHAKK0BAIC0zOSwwICs0MCw1IEBA IGludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10pCisrCisrdW5zaWduZWQgZmli UGx1c1NldmVuKHVuc2lnbmVkIG4pCisreworKyAgICByZXR1cm4gZmliKG4pICsgNzsKKyt9CitF T0YKKyAgICBleHBlY3RlZCA9PiA8PEVPRgorCisgICAgICAgIChmaWJQbHVzU2V2ZW4pOgorRU9G Cit9LAoreworICAgIHRlc3ROYW1lID0+ICJVbmlmaWVkIGRpZmYgd2l0aCAwIGNvbnRleHQ7IHJl bmFtZSBmdW5jdGlvbiIsCisgICAgaW5wdXRUZXh0ID0+ICRFWEFNUExFX0NQUCwKKyAgICBkaWZm VG9BcHBseSA9PiA8PEVPRiwKK2RpZmYgLS1naXQgYS9maWIuY3BwIGIvZmliLmNwcAorLS0tIGEv ZmliLmNwcAorKysrIGIvZmliLmNwcAorQEAgLTggKzggQEAgdW5zaWduZWQgZmliKHVuc2lnbmVk KTsKKy11bnNpZ25lZCBmaWJQbHVzRml2ZSh1bnNpZ25lZCBuKQorK3Vuc2lnbmVkIGZpYlBsdXNG aXZlMih1bnNpZ25lZCBuKQorRU9GCisgICAgZXhwZWN0ZWQgPT4gPDxFT0YKKworICAgICAgICAo ZmliUGx1c0ZpdmUyKToKKyAgICAgICAgKGZpYlBsdXNGaXZlKTogRGVsZXRlZC4KK0VPRgorfSwK K3sKKyAgICB0ZXN0TmFtZSA9PiAiVW5pZmllZCBkaWZmIHdpdGggMCBjb250ZXh0OyByZXBsYWNl IGZ1bmN0aW9uIiwKKyAgICBpbnB1dFRleHQgPT4gJEVYQU1QTEVfQ1BQLAorICAgIGRpZmZUb0Fw cGx5ID0+IDw8RU9GLAorZGlmZiAtLWdpdCBhL2ZpYi5jcHAgYi9maWIuY3BwCistLS0gYS9maWIu Y3BwCisrKysgYi9maWIuY3BwCitAQCAtOCw0ICs4LDUgQEAgdW5zaWduZWQgZmliKHVuc2lnbmVk KTsKKy11bnNpZ25lZCBmaWJQbHVzRml2ZSh1bnNpZ25lZCBuKQorLXsKKy0gICAgcmV0dXJuIGZp YihuKSArIDU7CistfQorK3Vuc2lnbmVkIGZpYlBsdXNTZXZlbih1bnNpZ25lZCBuKQorK3sgICAv LyBGaXJzdCBjb21tZW50CisrICAgIC8vIFNlY29uZCBjb21tZW50CisrICAgIHJldHVybiBmaWIo bikgKyA3OworK307CitFT0YKKyAgICBleHBlY3RlZCA9PiA8PEVPRgorCisgICAgICAgIChmaWJQ bHVzU2V2ZW4pOgorICAgICAgICAoZmliUGx1c0ZpdmUpOiBEZWxldGVkLgorRU9GCit9LAorewor ICAgIHRlc3ROYW1lID0+ICJVbmlmaWVkIGRpZmYgd2l0aCAwIGNvbnRleHQ7IG1vdmUgZnVuY3Rp b24gZnJvbSB0aGUgdG9wIG9mIHRoZSBmaWxlIHRvIHRoZSBlbmQgb2YgdGhlIGZpbGUiLAorICAg IGlucHV0VGV4dCA9PiAkRVhBTVBMRV9DUFAsCisgICAgZGlmZlRvQXBwbHkgPT4gPDxFT0YsCitk aWZmIC0tZ2l0IGEvZmliLmNwcCBiL2ZpYi5jcHAKKy0tLSBhL2ZpYi5jcHAKKysrKyBiL2ZpYi5j cHAKK0BAIC04LDUgKzcsMCBAQCB1bnNpZ25lZCBmaWIodW5zaWduZWQpOworLXVuc2lnbmVkIGZp YlBsdXNGaXZlKHVuc2lnbmVkIG4pCisteworLSAgICByZXR1cm4gZmliKG4pICsgNTsKKy19Cist CitAQCAtMzksMCArMzUsNSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltd KQorKworK3Vuc2lnbmVkIGZpYlBsdXNGaXZlKHVuc2lnbmVkIG4pCisreworKyAgICByZXR1cm4g ZmliKG4pICsgNTsKKyt9CitFT0YKKyAgICBleHBlY3RlZCA9PiA8PEVPRgorCisgICAgICAgIChm aWJQbHVzRml2ZSk6CitFT0YKK30sCit7CisgICAgdGVzdE5hbWUgPT4gIlVuaWZpZWQgZGlmZiB3 aXRoIDAgY29udGV4dDsgcmVtb3ZlIGZ1bmN0aW9ucyB3aXRoIHRoZSBzYW1lIG5hbWUiLAorICAg IGlucHV0VGV4dCA9PiAkRVhBTVBMRV9KQVZBU0NSSVBUX1dJVEhfU0FNRV9GVU5DVElPTl9ERUZJ TkVEX1RXSUNFLAorICAgIGRpZmZUb0FwcGx5ID0+IDw8RU9GLAorZGlmZiAtLWdpdCBhL2ZpYi5j cHAgYi9maWIuY3BwCistLS0gYS9maWIuY3BwCisrKysgYi9maWIuY3BwCitAQCAtMSw4ICswLDAg QEAKKy1mdW5jdGlvbiBmKCkgeworLSAgICByZXR1cm4gNTsKKy19CistCistZnVuY3Rpb24gZigp IHsKKy0gICAgcmV0dXJuIDY7CistfQorLQorRU9GCisgICAgZXhwZWN0ZWQgPT4gPDxFT0YKKwor ICAgICAgICAoZik6IERlbGV0ZWQuCitFT0YKK30sCit7CiAgICAgIyBUaGlzIGlzIGEgY29udHJp dmVkIGV4YW1wbGUgYW5kIHdvdWxkIGNhdXNlIGEgcmVkZWZpbml0aW9uIGVycm9yIGluIEMrKywg YnV0IGFuIGFuYWxhZ291cyBjaGFuZ2UgaW4gYSBKYXZhU2NyaXB0IHNjcmlwdCB3b3VsZCBiZSBm aW5lLgogICAgIHRlc3ROYW1lID0+ICJVbmlmaWVkIGRpZmYgd2l0aCAwIGNvbnRleHQ7IGFkZCBm dW5jdGlvbiBhYm92ZSBmdW5jdGlvbiB3aXRoIHRoZSBzYW1lIG5hbWUiLAogICAgIGlucHV0VGV4 dCA9PiAkRVhBTVBMRV9DUFAsCg==