186378 2018-06-06 19:27:17 -0700 [Win][MiniBrowser] Remove gMainWindow global variable 2018-06-06 23:27:16 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 184770 1 fujii fujii achristensen bfulgham lforschler pvollan rniwa webkit-bug-importer oldest_to_newest 1430672 0 fujii 2018-06-06 19:27:17 -0700 [Win][MiniBrowser] Remove gMainWindow global variable 1430682 1 342107 fujii 2018-06-06 19:47:06 -0700 Created attachment 342107 Patch 1430715 2 342107 rniwa 2018-06-06 22:33:31 -0700 Comment on attachment 342107 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=342107&action=review > Tools/MiniBrowser/win/Common.cpp:139 > + int strLen = GetWindowText(GetDlgItem(hDlg, IDC_AUTH_USER), str, 256); Can we use WTF_ARRAY_LENGTH or sizeof(str) / sizeof(*str) or std::size instead of hard-coding 256 twice? > Tools/MiniBrowser/win/Common.cpp:143 > + strLen = GetWindowText(GetDlgItem(hDlg, IDC_AUTH_PASSWORD), str, 256); Ditto. 1430724 3 fujii 2018-06-06 23:09:38 -0700 Thank you very much! I will fix them. 1430726 4 342124 fujii 2018-06-06 23:19:48 -0700 Created attachment 342124 Patch 1430728 5 fujii 2018-06-06 23:26:08 -0700 Committed r232574: <https://trac.webkit.org/changeset/232574> 1430729 6 webkit-bug-importer 2018-06-06 23:27:16 -0700 <rdar://problem/40882765> 342107 2018-06-06 19:47:06 -0700 2018-06-06 23:19:45 -0700 Patch bug-186378-20180607114704.patch text/plain 9681 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNThjZTcwZmQ4Y2JmY2IwNmViNzlkNjc0YmZmZWZlZDUx ZDcxYjJkZi4uMjg0ZjY2YWVjZGYxYjgxYjM0ZjA2NjQ4ZTBmMTQ4NzAxMTVjM2JiYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDE4LTA2LTA2ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBSZW1vdmUgZ01haW5XaW5kb3cgZ2xvYmFs IHZhcmlhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODYzNzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJJ20gZ29pbmcgdG8gc3VwcG9ydCBtdWx0aXBsZSBNYWluV2luZG93IGluIEJ1ZyAxODYyNjMu IEl0IHNob3VsZAorICAgICAgICBub3QgYmUgYXNzdW1lZCB0aGF0IE1haW5XaW5kb3cgaGFzIG9u bHkgb25lIGluc3RhbmNlLiBnTWFpbldpbmRvdworICAgICAgICBpcyB1c2VkIG9ubHkgaW4gRGlz cGxheUF1dGhEaWFsb2cuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vQ29tbW9uLmNwcDoK KyAgICAgICAgKGF1dGhEaWFsb2dQcm9jKTogVXNlIERXTFBfVVNFUiB0byBzdG9yZSB0aGUgZGlh bG9nIGRhdGEuCisgICAgICAgIChkaXNwbGF5QXV0aERpYWxvZyk6IE1vdmVkIGFuZCByZW5hbWVk IGZyb20KKyAgICAgICAgTWFpbldpbmRvdzo6ZGlzcGxheUF1dGhEaWFsb2cuIFVzZSBEaWFsb2dC b3hQYXJhbSBpbnN0ZWFkIG9mCisgICAgICAgIERpYWxvZ0JveCB0byBwYXNzIGEgZGF0YSBwb2lu dGVyLiBEbyBub3QgcmV0dXJuIFNfT0sgaWYKKyAgICAgICAgRGlhbG9nQm94UGFyYW0gcmV0dXJu cyAtMS4gVGFrZSBhIEhXTkQgYXJndW1lbnQgYXMgdGhlIHBhcmVudAorICAgICAgICB3aW5kb3cu CisgICAgICAgIChEaXNwbGF5QXV0aERpYWxvZyk6IERlbGV0ZWQuCisgICAgICAgICogTWluaUJy b3dzZXIvd2luL0NvbW1vbi5oOgorICAgICAgICAqIE1pbmlCcm93c2VyL3dpbi9NYWluV2luZG93 LmNwcDoKKyAgICAgICAgKGF1dGhEaWFsb2dQcm9jKTogTW92ZWQgdG8gQ29tbW9uLmNwcC4KKyAg ICAgICAgKE1haW5XaW5kb3c6OmRpc3BsYXlBdXRoRGlhbG9nKTogRGl0dG8uCisgICAgICAgICog TWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaDoKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4v UmVzb3VyY2VMb2FkRGVsZWdhdGUuY3BwOgorICAgICAgICAoUmVzb3VyY2VMb2FkRGVsZWdhdGU6 OmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSk6CisgICAgICAgICogTWluaUJyb3dz ZXIvd2luL1dpbk1haW4uY3BwOgorICAgICAgICAod1dpbk1haW4pOiBBZGRlZCBhIGxvY2FsIHZh cmlhYmxlIG1haW5XaW5kb3cgaW5zdGVhZCBvZiB1c2luZworICAgICAgICBnTWFpbldpbmRvdy4K KwogMjAxOC0wNi0wNiAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAg ICAgIFJlbmFtZSBjb2xvci1maWx0ZXIgdG8gLWFwcGxlLWNvbG9yLWZpbHRlciBhbmQgZG8gbm90 IGV4cG9zZSBpdCB0byBXZWIgY29udGVudApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv d2luL0NvbW1vbi5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vQ29tbW9uLmNwcAppbmRleCA0 YzI3ODI0YzVmOTcyOTI1ODlmY2I4MGJlOWM4YmQ4YjJhMGZiNGNlLi45NzdiYjA3NTYxNDI5MDky ZDMzNzMxZjk0NTIxMDE2MTJjMmExNWZkIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93 aW4vQ29tbW9uLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vQ29tbW9uLmNwcApAQCAt MjksMTMgKzI5LDEzIEBACiAjaW5jbHVkZSAic3RkYWZ4LmgiCiAjaW5jbHVkZSAiQ29tbW9uLmgi CiAKKyNpbmNsdWRlICJNaW5pQnJvd3NlckxpYlJlc291cmNlLmgiCiAjaW5jbHVkZSAiTWluaUJy b3dzZXJSZXBsYWNlLmgiCiAjaW5jbHVkZSA8ZGJnaGVscC5oPgogI2luY2x1ZGUgPHNobG9iai5o PgogCiAvLyBHbG9iYWwgVmFyaWFibGVzOgogSElOU1RBTkNFIGhJbnN0OwotTWFpbldpbmRvdyog Z01haW5XaW5kb3cgPSBudWxscHRyOwogCiAvLyBTdXBwb3J0IG1vdmluZyB0aGUgdHJhbnNwYXJl bnQgd2luZG93CiBQT0lOVCBzX3dpbmRvd1Bvc2l0aW9uID0geyAxMDAsIDEwMCB9OwpAQCAtMTE4 LDkgKzExOCw1MCBAQCB2b2lkIGNyZWF0ZUNyYXNoUmVwb3J0KEVYQ0VQVElPTl9QT0lOVEVSUyog ZXhjZXB0aW9uUG9pbnRlcnMpCiAgICAgfQogfQogCi1IUkVTVUxUIERpc3BsYXlBdXRoRGlhbG9n KHN0ZDo6d3N0cmluZyYgdXNlcm5hbWUsIHN0ZDo6d3N0cmluZyYgcGFzc3dvcmQpCitzdHJ1Y3Qg QXV0aERpYWxvZ0RhdGEgeworICAgIHN0ZDo6d3N0cmluZyYgdXNlcm5hbWU7CisgICAgc3RkOjp3 c3RyaW5nJiBwYXNzd29yZDsKK307CisKK3N0YXRpYyBJTlRfUFRSIENBTExCQUNLIGF1dGhEaWFs b2dQcm9jKEhXTkQgaERsZywgVUlOVCBtZXNzYWdlLCBXUEFSQU0gd1BhcmFtLCBMUEFSQU0gbFBh cmFtKQoreworICAgIEF1dGhEaWFsb2dEYXRhJiBkYXRhID0gKnJlaW50ZXJwcmV0X2Nhc3Q8QXV0 aERpYWxvZ0RhdGEqPihHZXRXaW5kb3dMb25nUHRyKGhEbGcsIERXTFBfVVNFUikpOworICAgIHN3 aXRjaCAobWVzc2FnZSkgeworICAgIGNhc2UgV01fSU5JVERJQUxPRzoKKyAgICAgICAgU2V0V2lu ZG93TG9uZ1B0cihoRGxnLCBEV0xQX1VTRVIsIGxQYXJhbSk7CisgICAgICAgIHJldHVybiBUUlVF OworCisgICAgY2FzZSBXTV9DT01NQU5EOiB7CisgICAgICAgIGludCB3bUlkID0gTE9XT1JEKHdQ YXJhbSk7CisgICAgICAgIHN3aXRjaCAod21JZCkgeworICAgICAgICBjYXNlIElET0s6IHsKKyAg ICAgICAgICAgIFRDSEFSIHN0clsyNTZdOworICAgICAgICAgICAgaW50IHN0ckxlbiA9IEdldFdp bmRvd1RleHQoR2V0RGxnSXRlbShoRGxnLCBJRENfQVVUSF9VU0VSKSwgc3RyLCAyNTYpOworICAg ICAgICAgICAgc3RyW3N0ckxlbl0gPSAwOworICAgICAgICAgICAgZGF0YS51c2VybmFtZSA9IHN0 cjsKKworICAgICAgICAgICAgc3RyTGVuID0gR2V0V2luZG93VGV4dChHZXREbGdJdGVtKGhEbGcs IElEQ19BVVRIX1BBU1NXT1JEKSwgc3RyLCAyNTYpOworICAgICAgICAgICAgc3RyW3N0ckxlbl0g PSAwOworICAgICAgICAgICAgZGF0YS5wYXNzd29yZCA9IHN0cjsKKworICAgICAgICAgICAgRW5k RGlhbG9nKGhEbGcsIHRydWUpOworICAgICAgICAgICAgcmV0dXJuIFRSVUU7CisgICAgICAgIH0K KyAgICAgICAgY2FzZSBJRENBTkNFTDoKKyAgICAgICAgICAgIEVuZERpYWxvZyhoRGxnLCBmYWxz ZSk7CisgICAgICAgICAgICByZXR1cm4gVFJVRTsKKyAgICAgICAgfQorICAgICAgICBicmVhazsK KyAgICB9CisgICAgfQorICAgIHJldHVybiBGQUxTRTsKK30KKworSFJFU1VMVCBkaXNwbGF5QXV0 aERpYWxvZyhIV05EIGh3bmQsIHN0ZDo6d3N0cmluZyYgdXNlcm5hbWUsIHN0ZDo6d3N0cmluZyYg cGFzc3dvcmQpCiB7Ci0gICAgcmV0dXJuIGdNYWluV2luZG93LT5kaXNwbGF5QXV0aERpYWxvZyh1 c2VybmFtZSwgcGFzc3dvcmQpOworICAgIEF1dGhEaWFsb2dEYXRhIGRhdGEgeyB1c2VybmFtZSwg cGFzc3dvcmQgfTsKKyAgICBhdXRvIHJlc3VsdCA9IERpYWxvZ0JveFBhcmFtKGhJbnN0LCBNQUtF SU5UUkVTT1VSQ0UoSUREX0FVVEgpLCBod25kLCBhdXRoRGlhbG9nUHJvYywgcmVpbnRlcnByZXRf Y2FzdDxMUEFSQU0+KCZkYXRhKSk7CisgICAgcmV0dXJuIHJlc3VsdCA+IDAgPyBTX09LIDogRV9G QUlMOwogfQogCiB2b2lkIHBhcnNlQ29tbWFuZExpbmUoYm9vbCYgdXNlc0xheWVyZWRXZWJWaWV3 LCBib29sJiB1c2VGdWxsRGVza3RvcCwgYm9vbCYgcGFnZUxvYWRUZXN0aW5nLCBfYnN0cl90JiBy ZXF1ZXN0ZWRVUkwpCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vQ29tbW9uLmgg Yi9Ub29scy9NaW5pQnJvd3Nlci93aW4vQ29tbW9uLmgKaW5kZXggNjY2M2QyNTg2ZTUwMDI0ZTUy MmNiN2ZhOTMzYThhOTM4NjhmM2JiMS4uNGVhMTI3MzhjZGM1ZDI1YTUxY2Q0M2JhMjQyMWY4NzQ5 ZGFlOTUxYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1vbi5oCisrKyBi L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Db21tb24uaApAQCAtMzMsOCArMzMsOCBAQCB2b2lkIGNv bXB1dGVGdWxsRGVza3RvcEZyYW1lKCk7CiBib29sIGdldEFwcERhdGFGb2xkZXIoX2JzdHJfdCYg ZGlyZWN0b3J5KTsKIHZvaWQgcGFyc2VDb21tYW5kTGluZShib29sJiB1c2VzTGF5ZXJlZFdlYlZp ZXcsIGJvb2wmIHVzZUZ1bGxEZXNrdG9wLCBib29sJiBwYWdlTG9hZFRlc3RpbmcsIF9ic3RyX3Qm IHJlcXVlc3RlZFVSTCk7CiB2b2lkIGNyZWF0ZUNyYXNoUmVwb3J0KEVYQ0VQVElPTl9QT0lOVEVS UyopOworSFJFU1VMVCBkaXNwbGF5QXV0aERpYWxvZyhIV05ELCBzdGQ6OndzdHJpbmcmIHVzZXJu YW1lLCBzdGQ6OndzdHJpbmcmIHBhc3N3b3JkKTsKIAogZXh0ZXJuIEhJTlNUQU5DRSBoSW5zdDsK LWV4dGVybiBNYWluV2luZG93KiBnTWFpbldpbmRvdzsKIGV4dGVybiBQT0lOVCBzX3dpbmRvd1Bv c2l0aW9uOwogZXh0ZXJuIFNJWkUgc193aW5kb3dTaXplOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWlu aUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5X aW5kb3cuY3BwCmluZGV4IDg3YTQ3N2NmNDRkOGFlNjc2NzRlODJkZjM0M2I3NTdkMzgzNWI1NDcu LmNkOGM1MzAzOTAyOWE1NGU5NTNlZGE1NWNiZmMxMzRjNWUwMWJlNzEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci93aW4vTWFpbldpbmRvdy5jcHAKQEAgLTM4Myw1NiArMzgzLDYgQEAgSU5UX1BUUiBDQUxMQkFD SyBNYWluV2luZG93OjpjdXN0b21Vc2VyQWdlbnREaWFsb2dQcm9jKEhXTkQgaERsZywgVUlOVCBt ZXNzYWdlLAogICAgIHJldHVybiAoSU5UX1BUUilGQUxTRTsKIH0KIAotc3RhdGljIElOVF9QVFIg Q0FMTEJBQ0sgYXV0aERpYWxvZ1Byb2MoSFdORCBoRGxnLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3 UGFyYW0sIExQQVJBTSBsUGFyYW0pCi17Ci0gICAgc3dpdGNoIChtZXNzYWdlKSB7Ci0gICAgY2Fz ZSBXTV9JTklURElBTE9HOiB7Ci0gICAgICAgIEhXTkQgZWRpdCA9IDo6R2V0RGxnSXRlbShoRGxn LCBJRENfQVVUSF9VU0VSKTsKLSAgICAgICAgOjpTZXRXaW5kb3dUZXh0KGVkaXQsIHN0YXRpY19j YXN0PExQQ1RTVFI+KEwiIikpOwotCi0gICAgICAgIGVkaXQgPSA6OkdldERsZ0l0ZW0oaERsZywg SURDX0FVVEhfUEFTU1dPUkQpOwotICAgICAgICA6OlNldFdpbmRvd1RleHQoZWRpdCwgc3RhdGlj X2Nhc3Q8TFBDVFNUUj4oTCIiKSk7Ci0gICAgICAgIHJldHVybiAoSU5UX1BUUilUUlVFOwotICAg IH0KLQotICAgIGNhc2UgV01fQ09NTUFORDoKLSAgICAgICAgaWYgKExPV09SRCh3UGFyYW0pID09 IElET0sgfHwgTE9XT1JEKHdQYXJhbSkgPT0gSURDQU5DRUwpIHsKLSAgICAgICAgICAgIElOVF9Q VFIgcmVzdWx0IHsgfTsKLQotICAgICAgICAgICAgaWYgKExPV09SRCh3UGFyYW0pID09IElET0sp IHsKLSAgICAgICAgICAgICAgICBUQ0hBUiB1c2VyWzI1Nl07Ci0gICAgICAgICAgICAgICAgaW50 IHN0ckxlbiA9IDo6R2V0V2luZG93VGV4dCg6OkdldERsZ0l0ZW0oaERsZywgSURDX0FVVEhfVVNF UiksIHVzZXIsIDI1Nik7Ci0gICAgICAgICAgICAgICAgdXNlcltzdHJMZW5dID0gMDsKLQotICAg ICAgICAgICAgICAgIFRDSEFSIHBhc3NbMjU2XTsKLSAgICAgICAgICAgICAgICBzdHJMZW4gPSA6 OkdldFdpbmRvd1RleHQoOjpHZXREbGdJdGVtKGhEbGcsIElEQ19BVVRIX1BBU1NXT1JEKSwgcGFz cywgMjU2KTsKLSAgICAgICAgICAgICAgICBwYXNzW3N0ckxlbl0gPSAwOwotCi0gICAgICAgICAg ICAgICAgcmVzdWx0ID0gcmVpbnRlcnByZXRfY2FzdDxJTlRfUFRSPihuZXcgc3RkOjpwYWlyPHN0 ZDo6d3N0cmluZywgc3RkOjp3c3RyaW5nPih1c2VyLCBwYXNzKSk7Ci0gICAgICAgICAgICB9Ci0K LSAgICAgICAgICAgIDo6RW5kRGlhbG9nKGhEbGcsIHJlc3VsdCk7Ci0gICAgICAgICAgICByZXR1 cm4gKElOVF9QVFIpVFJVRTsKLSAgICAgICAgfQotICAgICAgICBicmVhazsKLSAgICB9Ci0gICAg cmV0dXJuIChJTlRfUFRSKUZBTFNFOwotfQotCi1IUkVTVUxUIE1haW5XaW5kb3c6OmRpc3BsYXlB dXRoRGlhbG9nKHN0ZDo6d3N0cmluZyYgdXNlcm5hbWUsIHN0ZDo6d3N0cmluZyYgcGFzc3dvcmQp Ci17Ci0gICAgYXV0byByZXN1bHQgPSBEaWFsb2dCb3goaEluc3QsIE1BS0VJTlRSRVNPVVJDRShJ RERfQVVUSCksIGh3bmQoKSwgYXV0aERpYWxvZ1Byb2MpOwotICAgIGlmICghcmVzdWx0KQotICAg ICAgICByZXR1cm4gRV9GQUlMOwotCi0gICAgYXV0byBwYWlyID0gcmVpbnRlcnByZXRfY2FzdDxz dGQ6OnBhaXI8c3RkOjp3c3RyaW5nLCBzdGQ6OndzdHJpbmc+Kj4ocmVzdWx0KTsKLSAgICB1c2Vy bmFtZSA9IHBhaXItPmZpcnN0OwotICAgIHBhc3N3b3JkID0gcGFpci0+c2Vjb25kOwotICAgIGRl bGV0ZSBwYWlyOwotCi0gICAgcmV0dXJuIFNfT0s7Ci19Ci0KIHZvaWQgTWFpbldpbmRvdzo6bG9h ZFVSTChCU1RSIHVybCkKIHsKICAgICBpZiAoRkFJTEVEKG1fYnJvd3NlcldpbmRvdy0+bG9hZFVS TCh1cmwpKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93Lmgg Yi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5oCmluZGV4IDFjODhlZGVkMzg0ODVj ZmRhZDBkODBkNTA0OWEwNDYxMjM1ZmY5ZjAuLjBlYzRlZWUyNWY5MDZhNjcyNjFlY2FhMTM2NzZh YTQzMGI5ZTg3ZDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93 LmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaApAQCAtMzksNyArMzks NiBAQCBwdWJsaWM6CiAgICAgTWluaUJyb3dzZXIqIGJyb3dzZXJXaW5kb3coKSBjb25zdCB7IHJl dHVybiBtX2Jyb3dzZXJXaW5kb3cuZ2V0KCk7IH0KIAogICAgIHZvaWQgbG9hZFVSTChCU1RSIHVy bCk7Ci0gICAgSFJFU1VMVCBkaXNwbGF5QXV0aERpYWxvZyhzdGQ6OndzdHJpbmcmIHVzZXJuYW1l LCBzdGQ6OndzdHJpbmcmIHBhc3N3b3JkKTsKICAgICAKIHByaXZhdGU6CiAgICAgc3RhdGljIExS RVNVTFQgQ0FMTEJBQ0sgV25kUHJvYyhIV05ELCBVSU5ULCBXUEFSQU0sIExQQVJBTSk7CmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vUmVzb3VyY2VMb2FkRGVsZWdhdGUuY3BwIGIv VG9vbHMvTWluaUJyb3dzZXIvd2luL1Jlc291cmNlTG9hZERlbGVnYXRlLmNwcAppbmRleCA5MTUz YmM4Y2Y0NDI5ODIyMzg0MDc2NTEyOGY3M2NmZDA5Y2VkZDllLi4xM2JhZTNkMjUxMmU1OTAxNjI2 YjZkNjE1MmFiNzg2ZjQwNzcyNmFjIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci93aW4v UmVzb3VyY2VMb2FkRGVsZWdhdGUuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9SZXNv dXJjZUxvYWREZWxlZ2F0ZS5jcHAKQEAgLTI1LDYgKzI1LDcgQEAKICNpbmNsdWRlICJzdGRhZngu aCIKICNpbmNsdWRlICJSZXNvdXJjZUxvYWREZWxlZ2F0ZS5oIgogCisjaW5jbHVkZSAiQ29tbW9u LmgiCiAjaW5jbHVkZSAiTWluaUJyb3dzZXIuaCIKICNpbmNsdWRlICJQYWdlTG9hZFRlc3RDbGll bnQuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0NPTVB0ci5oPgpAQCAtMzcsOCArMzgsNiBAQAogI2lu Y2x1ZGUgPHN0cmluZz4KICNpbmNsdWRlIDx3aW5pbmV0Lmg+CiAKLWV4dGVybiBIUkVTVUxUIERp c3BsYXlBdXRoRGlhbG9nKHN0ZDo6d3N0cmluZyYgdXNlcm5hbWUsIHN0ZDo6d3N0cmluZyYgcGFz c3dvcmQpOwotCiBIUkVTVUxUIFJlc291cmNlTG9hZERlbGVnYXRlOjpRdWVyeUludGVyZmFjZShf SW5fIFJFRklJRCByaWlkLCBfQ09NX091dHB0cl8gdm9pZCoqIHBwdk9iamVjdCkKIHsKICAgICBp ZiAoIXBwdk9iamVjdCkKQEAgLTk0LDcgKzkzLDcgQEAgSFJFU1VMVCBSZXNvdXJjZUxvYWREZWxl Z2F0ZTo6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKF9Jbl9vcHRfIElXZWJWaWUK ICAgICAgICAgcmV0dXJuIEVfRkFJTDsKIAogICAgIHN0ZDo6d3N0cmluZyB1c2VybmFtZSwgcGFz c3dvcmQ7Ci0gICAgaWYgKERpc3BsYXlBdXRoRGlhbG9nKHVzZXJuYW1lLCBwYXNzd29yZCkgIT0g U19PSykKKyAgICBpZiAoZGlzcGxheUF1dGhEaWFsb2cobV9jbGllbnQtPmh3bmQoKSwgdXNlcm5h bWUsIHBhc3N3b3JkKSAhPSBTX09LKQogICAgICAgICByZXR1cm4gRV9GQUlMOwogCiAgICAgQ09N UHRyPElXZWJVUkxDcmVkZW50aWFsPiBjcmVkZW50aWFsOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWlu aUJyb3dzZXIvd2luL1dpbk1haW4uY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dpbk1haW4u Y3BwCmluZGV4IGZiOTNhNWIzYzgwNGE1NDEzNjQ3OTMxYmIwMzRlY2JkOTk3Yjk5NmUuLjMzN2Yz YmE2ZTE4MjFlZDA0ZmY1YTA2NTE3ZWJhMmUzMzJkY2ZiNWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01p bmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2lu TWFpbi5jcHAKQEAgLTY1LDE5ICs2NSwxOSBAQCBpbnQgV0lOQVBJIHdXaW5NYWluKF9Jbl8gSElO U1RBTkNFIGhJbnN0YW5jZSwgX0luX29wdF8gSElOU1RBTkNFIGhQcmV2SW5zdGFuY2UsCiAKICAg ICA6OlNldFByb2Nlc3NEUElBd2FyZSgpOwogCi0gICAgZ01haW5XaW5kb3cgPSBuZXcgTWFpbldp bmRvdygpOwotICAgIEhSRVNVTFQgaHIgPSBnTWFpbldpbmRvdy0+aW5pdChoSW5zdCwgdXNlc0xh eWVyZWRXZWJWaWV3LCBwYWdlTG9hZFRlc3RpbmcpOworICAgIGF1dG8gbWFpbldpbmRvdyA9IG5l dyBNYWluV2luZG93KCk7CisgICAgSFJFU1VMVCBociA9IG1haW5XaW5kb3ctPmluaXQoaEluc3Qs IHVzZXNMYXllcmVkV2ViVmlldywgcGFnZUxvYWRUZXN0aW5nKTsKICAgICBpZiAoRkFJTEVEKGhy KSkKICAgICAgICAgZ290byBleGl0OwogCi0gICAgU2hvd1dpbmRvdyhnTWFpbldpbmRvdy0+aHdu ZCgpLCBuQ21kU2hvdyk7CisgICAgU2hvd1dpbmRvdyhtYWluV2luZG93LT5od25kKCksIG5DbWRT aG93KTsKIAogICAgIGhBY2NlbFRhYmxlID0gTG9hZEFjY2VsZXJhdG9ycyhoSW5zdCwgTUFLRUlO VFJFU09VUkNFKElEQ19NSU5JQlJPV1NFUikpOwogCiAgICAgaWYgKHJlcXVlc3RlZFVSTC5sZW5n dGgoKSkKLSAgICAgICAgZ01haW5XaW5kb3ctPmxvYWRVUkwocmVxdWVzdGVkVVJMLkdldEJTVFIo KSk7CisgICAgICAgIG1haW5XaW5kb3ctPmxvYWRVUkwocmVxdWVzdGVkVVJMLkdldEJTVFIoKSk7 CiAgICAgZWxzZQotICAgICAgICBnTWFpbldpbmRvdy0+YnJvd3NlcldpbmRvdygpLT5sb2FkSFRN TFN0cmluZyhfYnN0cl90KGRlZmF1bHRIVE1MKS5HZXRCU1RSKCkpOworICAgICAgICBtYWluV2lu ZG93LT5icm93c2VyV2luZG93KCktPmxvYWRIVE1MU3RyaW5nKF9ic3RyX3QoZGVmYXVsdEhUTUwp LkdldEJTVFIoKSk7CiAKICNwcmFnbWEgd2FybmluZyhkaXNhYmxlOjQ1MDkpCiAK 342124 2018-06-06 23:19:48 -0700 2018-06-06 23:19:48 -0700 Patch bug-186378-20180607151947.patch text/plain 9750 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyNTY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNThjZTcwZmQ4Y2JmY2IwNmViNzlkNjc0YmZmZWZlZDUx ZDcxYjJkZi4uZjAwZjVlY2ExMmY3YjJhOGViM2NjZTE5ZjkxMTk5OGVlZjY1ZTUzNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMz IEBACisyMDE4LTA2LTA2ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBSZW1vdmUgZ01haW5XaW5kb3cgZ2xvYmFs IHZhcmlhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODYzNzgKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAg SSdtIGdvaW5nIHRvIHN1cHBvcnQgbXVsdGlwbGUgTWFpbldpbmRvdyBpbiBCdWcgMTg2MjYzLiBJ dCBzaG91bGQKKyAgICAgICAgbm90IGJlIGFzc3VtZWQgdGhhdCBNYWluV2luZG93IGhhcyBvbmx5 IG9uZSBpbnN0YW5jZS4gZ01haW5XaW5kb3cKKyAgICAgICAgaXMgdXNlZCBvbmx5IGluIERpc3Bs YXlBdXRoRGlhbG9nLgorCisgICAgICAgICogTWluaUJyb3dzZXIvd2luL0NvbW1vbi5jcHA6Cisg ICAgICAgIChhdXRoRGlhbG9nUHJvYyk6IFVzZSBEV0xQX1VTRVIgdG8gc3RvcmUgdGhlIGRpYWxv ZyBkYXRhLgorICAgICAgICAoZGlzcGxheUF1dGhEaWFsb2cpOiBNb3ZlZCBhbmQgcmVuYW1lZCBm cm9tCisgICAgICAgIE1haW5XaW5kb3c6OmRpc3BsYXlBdXRoRGlhbG9nLiBVc2UgRGlhbG9nQm94 UGFyYW0gaW5zdGVhZCBvZgorICAgICAgICBEaWFsb2dCb3ggdG8gcGFzcyBhIGRhdGEgcG9pbnRl ci4gRG8gbm90IHJldHVybiBTX09LIGlmCisgICAgICAgIERpYWxvZ0JveFBhcmFtIHJldHVybnMg LTEuIFRha2UgYSBIV05EIGFyZ3VtZW50IGFzIHRoZSBwYXJlbnQKKyAgICAgICAgd2luZG93Lgor ICAgICAgICAoRGlzcGxheUF1dGhEaWFsb2cpOiBEZWxldGVkLgorICAgICAgICAqIE1pbmlCcm93 c2VyL3dpbi9Db21tb24uaDoKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5j cHA6CisgICAgICAgIChhdXRoRGlhbG9nUHJvYyk6IE1vdmVkIHRvIENvbW1vbi5jcHAuCisgICAg ICAgIChNYWluV2luZG93OjpkaXNwbGF5QXV0aERpYWxvZyk6IERpdHRvLgorICAgICAgICAqIE1p bmlCcm93c2VyL3dpbi9NYWluV2luZG93Lmg6CisgICAgICAgICogTWluaUJyb3dzZXIvd2luL1Jl c291cmNlTG9hZERlbGVnYXRlLmNwcDoKKyAgICAgICAgKFJlc291cmNlTG9hZERlbGVnYXRlOjpk aWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UpOgorICAgICAgICAqIE1pbmlCcm93c2Vy L3dpbi9XaW5NYWluLmNwcDoKKyAgICAgICAgKHdXaW5NYWluKTogQWRkZWQgYSBsb2NhbCB2YXJp YWJsZSBtYWluV2luZG93IGluc3RlYWQgb2YgdXNpbmcKKyAgICAgICAgZ01haW5XaW5kb3cuCisK IDIwMTgtMDYtMDYgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZW5hbWUgY29sb3ItZmlsdGVyIHRvIC1hcHBsZS1jb2xvci1maWx0ZXIgYW5kIGRvIG5vdCBl eHBvc2UgaXQgdG8gV2ViIGNvbnRlbnQKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dp bi9Db21tb24uY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1vbi5jcHAKaW5kZXggNGMy NzgyNGM1Zjk3MjkyNTg5ZmNiODBiZTljOGJkOGIyYTBmYjRjZS4uZmEyNWY1NDJkMzU3Y2MzOGIy YmE0ZjFkMjNlYzllMzZlNTA0ZTFlYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2lu L0NvbW1vbi5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1vbi5jcHAKQEAgLTI5 LDEzICsyOSwxNCBAQAogI2luY2x1ZGUgInN0ZGFmeC5oIgogI2luY2x1ZGUgIkNvbW1vbi5oIgog CisjaW5jbHVkZSAiTWluaUJyb3dzZXJMaWJSZXNvdXJjZS5oIgogI2luY2x1ZGUgIk1pbmlCcm93 c2VyUmVwbGFjZS5oIgogI2luY2x1ZGUgPGRiZ2hlbHAuaD4KICNpbmNsdWRlIDxzaGxvYmouaD4K KyNpbmNsdWRlIDx3dGYvU3RkTGliRXh0cmFzLmg+CiAKIC8vIEdsb2JhbCBWYXJpYWJsZXM6CiBI SU5TVEFOQ0UgaEluc3Q7Ci1NYWluV2luZG93KiBnTWFpbldpbmRvdyA9IG51bGxwdHI7CiAKIC8v IFN1cHBvcnQgbW92aW5nIHRoZSB0cmFuc3BhcmVudCB3aW5kb3cKIFBPSU5UIHNfd2luZG93UG9z aXRpb24gPSB7IDEwMCwgMTAwIH07CkBAIC0xMTgsOSArMTE5LDUwIEBAIHZvaWQgY3JlYXRlQ3Jh c2hSZXBvcnQoRVhDRVBUSU9OX1BPSU5URVJTKiBleGNlcHRpb25Qb2ludGVycykKICAgICB9CiB9 CiAKLUhSRVNVTFQgRGlzcGxheUF1dGhEaWFsb2coc3RkOjp3c3RyaW5nJiB1c2VybmFtZSwgc3Rk Ojp3c3RyaW5nJiBwYXNzd29yZCkKK3N0cnVjdCBBdXRoRGlhbG9nRGF0YSB7CisgICAgc3RkOjp3 c3RyaW5nJiB1c2VybmFtZTsKKyAgICBzdGQ6OndzdHJpbmcmIHBhc3N3b3JkOworfTsKKworc3Rh dGljIElOVF9QVFIgQ0FMTEJBQ0sgYXV0aERpYWxvZ1Byb2MoSFdORCBoRGxnLCBVSU5UIG1lc3Nh Z2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCit7CisgICAgQXV0aERpYWxvZ0RhdGEm IGRhdGEgPSAqcmVpbnRlcnByZXRfY2FzdDxBdXRoRGlhbG9nRGF0YSo+KEdldFdpbmRvd0xvbmdQ dHIoaERsZywgRFdMUF9VU0VSKSk7CisgICAgc3dpdGNoIChtZXNzYWdlKSB7CisgICAgY2FzZSBX TV9JTklURElBTE9HOgorICAgICAgICBTZXRXaW5kb3dMb25nUHRyKGhEbGcsIERXTFBfVVNFUiwg bFBhcmFtKTsKKyAgICAgICAgcmV0dXJuIFRSVUU7CisKKyAgICBjYXNlIFdNX0NPTU1BTkQ6IHsK KyAgICAgICAgaW50IHdtSWQgPSBMT1dPUkQod1BhcmFtKTsKKyAgICAgICAgc3dpdGNoICh3bUlk KSB7CisgICAgICAgIGNhc2UgSURPSzogeworICAgICAgICAgICAgVENIQVIgc3RyWzI1Nl07Cisg ICAgICAgICAgICBpbnQgc3RyTGVuID0gR2V0V2luZG93VGV4dChHZXREbGdJdGVtKGhEbGcsIElE Q19BVVRIX1VTRVIpLCBzdHIsIFdURl9BUlJBWV9MRU5HVEgoc3RyKS0xKTsKKyAgICAgICAgICAg IHN0cltzdHJMZW5dID0gMDsKKyAgICAgICAgICAgIGRhdGEudXNlcm5hbWUgPSBzdHI7CisKKyAg ICAgICAgICAgIHN0ckxlbiA9IEdldFdpbmRvd1RleHQoR2V0RGxnSXRlbShoRGxnLCBJRENfQVVU SF9QQVNTV09SRCksIHN0ciwgV1RGX0FSUkFZX0xFTkdUSChzdHIpLTEpOworICAgICAgICAgICAg c3RyW3N0ckxlbl0gPSAwOworICAgICAgICAgICAgZGF0YS5wYXNzd29yZCA9IHN0cjsKKworICAg ICAgICAgICAgRW5kRGlhbG9nKGhEbGcsIHRydWUpOworICAgICAgICAgICAgcmV0dXJuIFRSVUU7 CisgICAgICAgIH0KKyAgICAgICAgY2FzZSBJRENBTkNFTDoKKyAgICAgICAgICAgIEVuZERpYWxv ZyhoRGxnLCBmYWxzZSk7CisgICAgICAgICAgICByZXR1cm4gVFJVRTsKKyAgICAgICAgfQorICAg ICAgICBicmVhazsKKyAgICB9CisgICAgfQorICAgIHJldHVybiBGQUxTRTsKK30KKworSFJFU1VM VCBkaXNwbGF5QXV0aERpYWxvZyhIV05EIGh3bmQsIHN0ZDo6d3N0cmluZyYgdXNlcm5hbWUsIHN0 ZDo6d3N0cmluZyYgcGFzc3dvcmQpCiB7Ci0gICAgcmV0dXJuIGdNYWluV2luZG93LT5kaXNwbGF5 QXV0aERpYWxvZyh1c2VybmFtZSwgcGFzc3dvcmQpOworICAgIEF1dGhEaWFsb2dEYXRhIGRhdGEg eyB1c2VybmFtZSwgcGFzc3dvcmQgfTsKKyAgICBhdXRvIHJlc3VsdCA9IERpYWxvZ0JveFBhcmFt KGhJbnN0LCBNQUtFSU5UUkVTT1VSQ0UoSUREX0FVVEgpLCBod25kLCBhdXRoRGlhbG9nUHJvYywg cmVpbnRlcnByZXRfY2FzdDxMUEFSQU0+KCZkYXRhKSk7CisgICAgcmV0dXJuIHJlc3VsdCA+IDAg PyBTX09LIDogRV9GQUlMOwogfQogCiB2b2lkIHBhcnNlQ29tbWFuZExpbmUoYm9vbCYgdXNlc0xh eWVyZWRXZWJWaWV3LCBib29sJiB1c2VGdWxsRGVza3RvcCwgYm9vbCYgcGFnZUxvYWRUZXN0aW5n LCBfYnN0cl90JiByZXF1ZXN0ZWRVUkwpCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93 aW4vQ29tbW9uLmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vQ29tbW9uLmgKaW5kZXggNjY2M2Qy NTg2ZTUwMDI0ZTUyMmNiN2ZhOTMzYThhOTM4NjhmM2JiMS4uNGVhMTI3MzhjZGM1ZDI1YTUxY2Q0 M2JhMjQyMWY4NzQ5ZGFlOTUxYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0Nv bW1vbi5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Db21tb24uaApAQCAtMzMsOCArMzMs OCBAQCB2b2lkIGNvbXB1dGVGdWxsRGVza3RvcEZyYW1lKCk7CiBib29sIGdldEFwcERhdGFGb2xk ZXIoX2JzdHJfdCYgZGlyZWN0b3J5KTsKIHZvaWQgcGFyc2VDb21tYW5kTGluZShib29sJiB1c2Vz TGF5ZXJlZFdlYlZpZXcsIGJvb2wmIHVzZUZ1bGxEZXNrdG9wLCBib29sJiBwYWdlTG9hZFRlc3Rp bmcsIF9ic3RyX3QmIHJlcXVlc3RlZFVSTCk7CiB2b2lkIGNyZWF0ZUNyYXNoUmVwb3J0KEVYQ0VQ VElPTl9QT0lOVEVSUyopOworSFJFU1VMVCBkaXNwbGF5QXV0aERpYWxvZyhIV05ELCBzdGQ6Ondz dHJpbmcmIHVzZXJuYW1lLCBzdGQ6OndzdHJpbmcmIHBhc3N3b3JkKTsKIAogZXh0ZXJuIEhJTlNU QU5DRSBoSW5zdDsKLWV4dGVybiBNYWluV2luZG93KiBnTWFpbldpbmRvdzsKIGV4dGVybiBQT0lO VCBzX3dpbmRvd1Bvc2l0aW9uOwogZXh0ZXJuIFNJWkUgc193aW5kb3dTaXplOwpkaWZmIC0tZ2l0 IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dz ZXIvd2luL01haW5XaW5kb3cuY3BwCmluZGV4IDg3YTQ3N2NmNDRkOGFlNjc2NzRlODJkZjM0M2I3 NTdkMzgzNWI1NDcuLmNkOGM1MzAzOTAyOWE1NGU5NTNlZGE1NWNiZmMxMzRjNWUwMWJlNzEgMTAw NjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NYWluV2luZG93LmNwcAorKysgYi9Ub29s cy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5jcHAKQEAgLTM4Myw1NiArMzgzLDYgQEAgSU5U X1BUUiBDQUxMQkFDSyBNYWluV2luZG93OjpjdXN0b21Vc2VyQWdlbnREaWFsb2dQcm9jKEhXTkQg aERsZywgVUlOVCBtZXNzYWdlLAogICAgIHJldHVybiAoSU5UX1BUUilGQUxTRTsKIH0KIAotc3Rh dGljIElOVF9QVFIgQ0FMTEJBQ0sgYXV0aERpYWxvZ1Byb2MoSFdORCBoRGxnLCBVSU5UIG1lc3Nh Z2UsIFdQQVJBTSB3UGFyYW0sIExQQVJBTSBsUGFyYW0pCi17Ci0gICAgc3dpdGNoIChtZXNzYWdl KSB7Ci0gICAgY2FzZSBXTV9JTklURElBTE9HOiB7Ci0gICAgICAgIEhXTkQgZWRpdCA9IDo6R2V0 RGxnSXRlbShoRGxnLCBJRENfQVVUSF9VU0VSKTsKLSAgICAgICAgOjpTZXRXaW5kb3dUZXh0KGVk aXQsIHN0YXRpY19jYXN0PExQQ1RTVFI+KEwiIikpOwotCi0gICAgICAgIGVkaXQgPSA6OkdldERs Z0l0ZW0oaERsZywgSURDX0FVVEhfUEFTU1dPUkQpOwotICAgICAgICA6OlNldFdpbmRvd1RleHQo ZWRpdCwgc3RhdGljX2Nhc3Q8TFBDVFNUUj4oTCIiKSk7Ci0gICAgICAgIHJldHVybiAoSU5UX1BU UilUUlVFOwotICAgIH0KLQotICAgIGNhc2UgV01fQ09NTUFORDoKLSAgICAgICAgaWYgKExPV09S RCh3UGFyYW0pID09IElET0sgfHwgTE9XT1JEKHdQYXJhbSkgPT0gSURDQU5DRUwpIHsKLSAgICAg ICAgICAgIElOVF9QVFIgcmVzdWx0IHsgfTsKLQotICAgICAgICAgICAgaWYgKExPV09SRCh3UGFy YW0pID09IElET0spIHsKLSAgICAgICAgICAgICAgICBUQ0hBUiB1c2VyWzI1Nl07Ci0gICAgICAg ICAgICAgICAgaW50IHN0ckxlbiA9IDo6R2V0V2luZG93VGV4dCg6OkdldERsZ0l0ZW0oaERsZywg SURDX0FVVEhfVVNFUiksIHVzZXIsIDI1Nik7Ci0gICAgICAgICAgICAgICAgdXNlcltzdHJMZW5d ID0gMDsKLQotICAgICAgICAgICAgICAgIFRDSEFSIHBhc3NbMjU2XTsKLSAgICAgICAgICAgICAg ICBzdHJMZW4gPSA6OkdldFdpbmRvd1RleHQoOjpHZXREbGdJdGVtKGhEbGcsIElEQ19BVVRIX1BB U1NXT1JEKSwgcGFzcywgMjU2KTsKLSAgICAgICAgICAgICAgICBwYXNzW3N0ckxlbl0gPSAwOwot Ci0gICAgICAgICAgICAgICAgcmVzdWx0ID0gcmVpbnRlcnByZXRfY2FzdDxJTlRfUFRSPihuZXcg c3RkOjpwYWlyPHN0ZDo6d3N0cmluZywgc3RkOjp3c3RyaW5nPih1c2VyLCBwYXNzKSk7Ci0gICAg ICAgICAgICB9Ci0KLSAgICAgICAgICAgIDo6RW5kRGlhbG9nKGhEbGcsIHJlc3VsdCk7Ci0gICAg ICAgICAgICByZXR1cm4gKElOVF9QVFIpVFJVRTsKLSAgICAgICAgfQotICAgICAgICBicmVhazsK LSAgICB9Ci0gICAgcmV0dXJuIChJTlRfUFRSKUZBTFNFOwotfQotCi1IUkVTVUxUIE1haW5XaW5k b3c6OmRpc3BsYXlBdXRoRGlhbG9nKHN0ZDo6d3N0cmluZyYgdXNlcm5hbWUsIHN0ZDo6d3N0cmlu ZyYgcGFzc3dvcmQpCi17Ci0gICAgYXV0byByZXN1bHQgPSBEaWFsb2dCb3goaEluc3QsIE1BS0VJ TlRSRVNPVVJDRShJRERfQVVUSCksIGh3bmQoKSwgYXV0aERpYWxvZ1Byb2MpOwotICAgIGlmICgh cmVzdWx0KQotICAgICAgICByZXR1cm4gRV9GQUlMOwotCi0gICAgYXV0byBwYWlyID0gcmVpbnRl cnByZXRfY2FzdDxzdGQ6OnBhaXI8c3RkOjp3c3RyaW5nLCBzdGQ6OndzdHJpbmc+Kj4ocmVzdWx0 KTsKLSAgICB1c2VybmFtZSA9IHBhaXItPmZpcnN0OwotICAgIHBhc3N3b3JkID0gcGFpci0+c2Vj b25kOwotICAgIGRlbGV0ZSBwYWlyOwotCi0gICAgcmV0dXJuIFNfT0s7Ci19Ci0KIHZvaWQgTWFp bldpbmRvdzo6bG9hZFVSTChCU1RSIHVybCkKIHsKICAgICBpZiAoRkFJTEVEKG1fYnJvd3Nlcldp bmRvdy0+bG9hZFVSTCh1cmwpKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9N YWluV2luZG93LmggYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWFpbldpbmRvdy5oCmluZGV4IDFj ODhlZGVkMzg0ODVjZmRhZDBkODBkNTA0OWEwNDYxMjM1ZmY5ZjAuLjBlYzRlZWUyNWY5MDZhNjcy NjFlY2FhMTM2NzZhYTQzMGI5ZTg3ZDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dp bi9NYWluV2luZG93LmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01haW5XaW5kb3cuaApA QCAtMzksNyArMzksNiBAQCBwdWJsaWM6CiAgICAgTWluaUJyb3dzZXIqIGJyb3dzZXJXaW5kb3co KSBjb25zdCB7IHJldHVybiBtX2Jyb3dzZXJXaW5kb3cuZ2V0KCk7IH0KIAogICAgIHZvaWQgbG9h ZFVSTChCU1RSIHVybCk7Ci0gICAgSFJFU1VMVCBkaXNwbGF5QXV0aERpYWxvZyhzdGQ6OndzdHJp bmcmIHVzZXJuYW1lLCBzdGQ6OndzdHJpbmcmIHBhc3N3b3JkKTsKICAgICAKIHByaXZhdGU6CiAg ICAgc3RhdGljIExSRVNVTFQgQ0FMTEJBQ0sgV25kUHJvYyhIV05ELCBVSU5ULCBXUEFSQU0sIExQ QVJBTSk7CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vUmVzb3VyY2VMb2FkRGVs ZWdhdGUuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL1Jlc291cmNlTG9hZERlbGVnYXRlLmNw cAppbmRleCA5MTUzYmM4Y2Y0NDI5ODIyMzg0MDc2NTEyOGY3M2NmZDA5Y2VkZDllLi4xM2JhZTNk MjUxMmU1OTAxNjI2YjZkNjE1MmFiNzg2ZjQwNzcyNmFjIDEwMDY0NAotLS0gYS9Ub29scy9NaW5p QnJvd3Nlci93aW4vUmVzb3VyY2VMb2FkRGVsZWdhdGUuY3BwCisrKyBiL1Rvb2xzL01pbmlCcm93 c2VyL3dpbi9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5jcHAKQEAgLTI1LDYgKzI1LDcgQEAKICNpbmNs dWRlICJzdGRhZnguaCIKICNpbmNsdWRlICJSZXNvdXJjZUxvYWREZWxlZ2F0ZS5oIgogCisjaW5j bHVkZSAiQ29tbW9uLmgiCiAjaW5jbHVkZSAiTWluaUJyb3dzZXIuaCIKICNpbmNsdWRlICJQYWdl TG9hZFRlc3RDbGllbnQuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0NPTVB0ci5oPgpAQCAtMzcsOCAr MzgsNiBAQAogI2luY2x1ZGUgPHN0cmluZz4KICNpbmNsdWRlIDx3aW5pbmV0Lmg+CiAKLWV4dGVy biBIUkVTVUxUIERpc3BsYXlBdXRoRGlhbG9nKHN0ZDo6d3N0cmluZyYgdXNlcm5hbWUsIHN0ZDo6 d3N0cmluZyYgcGFzc3dvcmQpOwotCiBIUkVTVUxUIFJlc291cmNlTG9hZERlbGVnYXRlOjpRdWVy eUludGVyZmFjZShfSW5fIFJFRklJRCByaWlkLCBfQ09NX091dHB0cl8gdm9pZCoqIHBwdk9iamVj dCkKIHsKICAgICBpZiAoIXBwdk9iamVjdCkKQEAgLTk0LDcgKzkzLDcgQEAgSFJFU1VMVCBSZXNv dXJjZUxvYWREZWxlZ2F0ZTo6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKF9Jbl9v cHRfIElXZWJWaWUKICAgICAgICAgcmV0dXJuIEVfRkFJTDsKIAogICAgIHN0ZDo6d3N0cmluZyB1 c2VybmFtZSwgcGFzc3dvcmQ7Ci0gICAgaWYgKERpc3BsYXlBdXRoRGlhbG9nKHVzZXJuYW1lLCBw YXNzd29yZCkgIT0gU19PSykKKyAgICBpZiAoZGlzcGxheUF1dGhEaWFsb2cobV9jbGllbnQtPmh3 bmQoKSwgdXNlcm5hbWUsIHBhc3N3b3JkKSAhPSBTX09LKQogICAgICAgICByZXR1cm4gRV9GQUlM OwogCiAgICAgQ09NUHRyPElXZWJVUkxDcmVkZW50aWFsPiBjcmVkZW50aWFsOwpkaWZmIC0tZ2l0 IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dpbk1haW4uY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIv d2luL1dpbk1haW4uY3BwCmluZGV4IGZiOTNhNWIzYzgwNGE1NDEzNjQ3OTMxYmIwMzRlY2JkOTk3 Yjk5NmUuLjMzN2YzYmE2ZTE4MjFlZDA0ZmY1YTA2NTE3ZWJhMmUzMzJkY2ZiNWIgMTAwNjQ0Ci0t LSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcAorKysgYi9Ub29scy9NaW5pQnJv d3Nlci93aW4vV2luTWFpbi5jcHAKQEAgLTY1LDE5ICs2NSwxOSBAQCBpbnQgV0lOQVBJIHdXaW5N YWluKF9Jbl8gSElOU1RBTkNFIGhJbnN0YW5jZSwgX0luX29wdF8gSElOU1RBTkNFIGhQcmV2SW5z dGFuY2UsCiAKICAgICA6OlNldFByb2Nlc3NEUElBd2FyZSgpOwogCi0gICAgZ01haW5XaW5kb3cg PSBuZXcgTWFpbldpbmRvdygpOwotICAgIEhSRVNVTFQgaHIgPSBnTWFpbldpbmRvdy0+aW5pdCho SW5zdCwgdXNlc0xheWVyZWRXZWJWaWV3LCBwYWdlTG9hZFRlc3RpbmcpOworICAgIGF1dG8gbWFp bldpbmRvdyA9IG5ldyBNYWluV2luZG93KCk7CisgICAgSFJFU1VMVCBociA9IG1haW5XaW5kb3ct PmluaXQoaEluc3QsIHVzZXNMYXllcmVkV2ViVmlldywgcGFnZUxvYWRUZXN0aW5nKTsKICAgICBp ZiAoRkFJTEVEKGhyKSkKICAgICAgICAgZ290byBleGl0OwogCi0gICAgU2hvd1dpbmRvdyhnTWFp bldpbmRvdy0+aHduZCgpLCBuQ21kU2hvdyk7CisgICAgU2hvd1dpbmRvdyhtYWluV2luZG93LT5o d25kKCksIG5DbWRTaG93KTsKIAogICAgIGhBY2NlbFRhYmxlID0gTG9hZEFjY2VsZXJhdG9ycyho SW5zdCwgTUFLRUlOVFJFU09VUkNFKElEQ19NSU5JQlJPV1NFUikpOwogCiAgICAgaWYgKHJlcXVl c3RlZFVSTC5sZW5ndGgoKSkKLSAgICAgICAgZ01haW5XaW5kb3ctPmxvYWRVUkwocmVxdWVzdGVk VVJMLkdldEJTVFIoKSk7CisgICAgICAgIG1haW5XaW5kb3ctPmxvYWRVUkwocmVxdWVzdGVkVVJM LkdldEJTVFIoKSk7CiAgICAgZWxzZQotICAgICAgICBnTWFpbldpbmRvdy0+YnJvd3NlcldpbmRv dygpLT5sb2FkSFRNTFN0cmluZyhfYnN0cl90KGRlZmF1bHRIVE1MKS5HZXRCU1RSKCkpOworICAg ICAgICBtYWluV2luZG93LT5icm93c2VyV2luZG93KCktPmxvYWRIVE1MU3RyaW5nKF9ic3RyX3Qo ZGVmYXVsdEhUTUwpLkdldEJTVFIoKSk7CiAKICNwcmFnbWEgd2FybmluZyhkaXNhYmxlOjQ1MDkp CiAK