190157 2018-10-01 14:21:56 -0700 Don't read from WebCore's bundle for IDNScriptWhiteList 2018-10-01 17:22:23 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen aestes mitz thorton webkit-bug-importer oldest_to_newest 1465226 0 achristensen 2018-10-01 14:21:56 -0700 Don't read from a file for IDNScriptWhiteList 1465228 1 351298 achristensen 2018-10-01 14:23:22 -0700 Created attachment 351298 Patch 1465253 2 351307 achristensen 2018-10-01 14:50:38 -0700 Created attachment 351307 Patch 1465287 3 351307 mitz 2018-10-01 15:54:06 -0700 Comment on attachment 351307 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351307&action=review > Source/WebCore/ChangeLog:8 > + No change in behavior. This increases performance by not reading from a file, Can you explain how the behavior where if a whitelist is placed in /Library or ~/Library, its contents is used instead of the built-in list is maintained with this change? 1465289 4 351319 achristensen 2018-10-01 16:08:13 -0700 Created attachment 351319 Patch 1465324 5 achristensen 2018-10-01 17:21:26 -0700 http://trac.webkit.org/r236703 1465325 6 webkit-bug-importer 2018-10-01 17:22:23 -0700 <rdar://problem/44926790> 351298 2018-10-01 14:23:22 -0700 2018-10-01 14:50:36 -0700 Patch bug-190157-20181001142322.patch text/plain 8878 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNjY5MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE4LTEwLTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgcmVh ZCBmcm9tIGEgZmlsZSBmb3IgSUROU2NyaXB0V2hpdGVMaXN0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTAxNTcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuICBUaGlz IGluY3JlYXNlcyBwZXJmb3JtYW5jZSBieSBub3QgcmVhZGluZyBmcm9tIGEgZmlsZSwKKyAgICAg ICAgYW5kIGl0IG1ha2VzIGl0IHNvIHRoYXQgVVJMLXJlbGF0ZWQgZnVuY3Rpb25hbGl0eSBjYW4g YmUgbW92ZWQgdG8gYSBwbGFjZSB3aXRob3V0CisgICAgICAgIGEgYnVuZGxlIGZvciByZXNvdXJj ZXMuCisKKyAgICAgICAgKiBSZXNvdXJjZXMvSUROU2NyaXB0V2hpdGVMaXN0LnR4dDogUmVtb3Zl ZC4KKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAg ICogcGxhdGZvcm0vbWFjL1dlYkNvcmVOU1VSTEV4dHJhcy5tbToKKyAgICAgICAgKFdlYkNvcmU6 OndoaXRlTGlzdElETlNjcmlwdHMpOgorICAgICAgICAoV2ViQ29yZTo6YWxsQ2hhcmFjdGVyc0lu SUROU2NyaXB0V2hpdGVMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OnJlYWRJRE5TY3JpcHRXaGl0 ZUxpc3RGaWxlKTogRGVsZXRlZC4KKwogMjAxOC0xMC0wMSAgU2lodWkgTGl1ICA8c2lodWlfbGl1 QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgU3RvcmFnZVByb2Nlc3MKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL1Jlc291cmNlcy9JRE5TY3JpcHRXaGl0ZUxpc3QudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9JRE5TY3JpcHRXaGl0ZUxpc3QudHh0CShyZXZpc2lv biAyMzY2NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvSUROU2NyaXB0V2hpdGVMaXN0 LnR4dAkobm9uZXhpc3RlbnQpCkBAIC0xLDIzICswLDAgQEAKLSMgRGVmYXVsdCBXZWIgS2l0IElu dGVybmF0aW9uYWwgRG9tYWluIE5hbWUgU2NyaXB0IFdoaXRlIExpc3QuCi0KLUNvbW1vbgotSW5o ZXJpdGVkCi0KLUFyYWJpYwotQXJtZW5pYW4KLUJvcG9tb2ZvCi1DYW5hZGlhbl9BYm9yaWdpbmFs Ci1EZXZhbmFnYXJpCi1EZXNlcmV0Ci1HdWphcmF0aQotR3VybXVraGkKLUhhbmd1bAotSGFuCi1I ZWJyZXcKLUhpcmFnYW5hCi1LYXRha2FuYV9Pcl9IaXJhZ2FuYQotS2F0YWthbmEKLUxhdGluCi1U YW1pbAotVGhhaQotWWkKClByb3BlcnR5IGNoYW5nZXMgb246IFNvdXJjZS9XZWJDb3JlL1Jlc291 cmNlcy9JRE5TY3JpcHRXaGl0ZUxpc3QudHh0Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KRGVsZXRlZDogc3ZuOmVvbC1z dHlsZQojIyAtMSArMCwwICMjCi1uYXRpdmUKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0 eQpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagkocmV2aXNpb24gMjM2NjczKQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0yMjU0LDcgKzIyNTQsNiBA QAogCQk3Q0MyREUwMzFFQ0EwNEE1MDAyN0I3NzQgLyogTm90aWZpY2F0aW9uRGlyZWN0aW9uLmgg aW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0MyREUwMjFF Q0EwNEE1MDAyN0I3NzQgLyogTm90aWZpY2F0aW9uRGlyZWN0aW9uLmggKi87IHNldHRpbmdzID0g e0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJN0NDNTY0QjgxOEJBQkVBNjAwMUI5 NjUyIC8qIFRlbGVwaG9uZU51bWJlckRldGVjdG9yLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0M1NjRCNjE4QkFCRUE2MDAxQjk2NTIgLyogVGVsZXBo b25lTnVtYmVyRGV0ZWN0b3IuaCAqLzsgfTsKIAkJN0NDNjk5NDExOTFFQzVGNTAwQUYyMjcwIC8q IEpTV2ViS2l0TmFtZXNwYWNlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA3Q0M2OTkzRjE5MUVDNUY1MDBBRjIyNzAgLyogSlNXZWJLaXROYW1lc3BhY2Uu aCAqLzsgfTsKLQkJN0NDN0UzRDcxNzIwOEMwRjAwM0M1Mjc3IC8qIElETlNjcmlwdFdoaXRlTGlz dC50eHQgaW4gUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdD QzdFM0Q2MTcyMDhDMEYwMDNDNTI3NyAvKiBJRE5TY3JpcHRXaGl0ZUxpc3QudHh0ICovOyB9Owog CQk3Q0M5NzIyRTFGOTNFMzM2MDAwNEQ0Q0YgLyogU2V0dGluZ3NCYXNlLmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0M2NjA5OTFGOTMwNTc4MDBENTAw RTkgLyogU2V0dGluZ3NCYXNlLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0 ZSwgKTsgfTsgfTsKIAkJN0NDRUJGQzAxREQ4RjZBQjAwMkM0MEI4IC8qIFNWR0xlbmd0aFZhbHVl LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0U1OEQ1 MzFERDdCMDkzMDAxMjg1NTIgLyogU1ZHTGVuZ3RoVmFsdWUuaCAqLzsgc2V0dGluZ3MgPSB7QVRU UklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk3Q0QwQkEwNTFCOEY3OUM5MDA1Q0VCQkUg LyogQWN0aXZlRE9NQ2FsbGJhY2tNaWNyb3Rhc2suaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDRDBCQTAzMUI4Rjc5QzkwMDVDRUJCRSAvKiBBY3RpdmVE T01DYWxsYmFja01pY3JvdGFzay5oICovOyB9OwpAQCAtOTY4MSw3ICs5NjgwLDYgQEAKIAkJN0ND NjYwOUIxRjkzMDU3OTAwRDUwMEU5IC8qIFNldHRpbmdzQmFzZS5jcHAgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBTZXR0aW5nc0Jhc2UuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQk3Q0M2OTkzRTE5MUVDNUY1MDBBRjIyNzAgLyogSlNXZWJLaXROYW1lc3Bh Y2UuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNXZWJLaXROYW1l c3BhY2UuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3Q0M2OTkzRjE5MUVDNUY1 MDBBRjIyNzAgLyogSlNXZWJLaXROYW1lc3BhY2UuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gSlNXZWJLaXROYW1lc3BhY2UuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK LQkJN0NDN0UzRDYxNzIwOEMwRjAwM0M1Mjc3IC8qIElETlNjcmlwdFdoaXRlTGlzdC50eHQgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSB0ZXh0OyBwYXRoID0gSUROU2NyaXB0V2hpdGVMaXN0LnR4dDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJN0NEMEJBMDIxQjhGNzlDOTAwNUNFQkJFIC8qIEFjdGl2ZURPTUNh bGxiYWNrTWljcm90YXNrLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9 IEFjdGl2ZURPTUNhbGxiYWNrTWljcm90YXNrLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJN0NEMEJBMDMxQjhGNzlDOTAwNUNFQkJFIC8qIEFjdGl2ZURPTUNhbGxiYWNrTWljcm90 YXNrLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEFjdGl2ZURPTUNhbGxiYWNr TWljcm90YXNrLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdDRDBFMkI1MUY4MEE0 ODIwMDE2QTRDRSAvKiBBYm9ydENvbnRyb2xsZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQWJvcnRDb250 cm9sbGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xNTc2NSw3ICsxNTc2Myw2 IEBACiAJCQkJNjU5OThBNjUwRTVGNUZEMzAwNEUwOTdBIC8qIGltYWdlcyAqLywKIAkJCQlBMUFB OUFCODFEMjM5MTE1MDBGRUFEQjMgLyogQ29udGVudEZpbHRlckJsb2NrZWRQYWdlLmh0bWwgKi8s CiAJCQkJQTExRThDMDAxQjFFMjhCRTAwMDNBN0M3IC8qIGNvcHlDdXJzb3IucG5nICovLAotCQkJ CTdDQzdFM0Q2MTcyMDhDMEYwMDNDNTI3NyAvKiBJRE5TY3JpcHRXaGl0ZUxpc3QudHh0ICovLAog CQkJCTJEOUYwRTEyMTRGRjFDQkYwMEJBMEZGNyAvKiBsaW5lYXJTUkdCLmljYyAqLywKIAkJCQlC Q0FEMTgwODEzMUM3QTBEMDA5OTA0MDYgLyogTG9jYWxpemFibGUuc3RyaW5ncyAqLywKIAkJCQk4 MzdBODAxMTFFMUUxMjczMDAwMjZCOUYgLyogTG9jYWxpemFibGUuc3RyaW5nc2RpY3QgKi8sCkBA IC0zMTM3OCw3ICszMTM3NSw2IEBACiAJCQkJMkQ1MEE0QjgxQ0UxMEUwMDAwMTk4MDQ5IC8qIEF0 dGFjaG1lbnRQbGFjZWhvbGRlckAyeC5wbmcgaW4gUmVzb3VyY2VzICovLAogCQkJCUExQUE5QUI5 MUQyMzkxMTUwMEZFQURCMyAvKiBDb250ZW50RmlsdGVyQmxvY2tlZFBhZ2UuaHRtbCBpbiBSZXNv dXJjZXMgKi8sCiAJCQkJQTExRThDMDUxQjFFMjhGNDAwMDNBN0M3IC8qIGNvcHlDdXJzb3IucG5n IGluIFJlc291cmNlcyAqLywKLQkJCQk3Q0M3RTNENzE3MjA4QzBGMDAzQzUyNzcgLyogSUROU2Ny aXB0V2hpdGVMaXN0LnR4dCBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJMkQ5RjBFMTMxNEZGMUNCRjAw QkEwRkY3IC8qIGxpbmVhclNSR0IuaWNjIGluIFJlc291cmNlcyAqLywKIAkJCQlFNTlERDRCODIx MDk4Mjg3MDAzQzhCNDcgLyogTGlzdEJ1dHRvbkFycm93LnBuZyBpbiBSZXNvdXJjZXMgKi8sCiAJ CQkJRTUxNjY5OTEyMEZGOTkxODAwOUQyQzI3IC8qIExpc3RCdXR0b25BcnJvd0AyeC5wbmcgaW4g UmVzb3VyY2VzICovLApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVO U1VSTEV4dHJhcy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv V2ViQ29yZU5TVVJMRXh0cmFzLm1tCShyZXZpc2lvbiAyMzY2NzMpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZU5TVVJMRXh0cmFzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0y NDcsNTkgKzI0Nyw0NSBAQCBzdGF0aWMgQk9PTCBpc0xvb2thbGlrZUNoYXJhY3RlcihzdGQ6Om9w CiAgICAgfQogfQogCi1zdGF0aWMgQk9PTCByZWFkSUROU2NyaXB0V2hpdGVMaXN0RmlsZShOU1N0 cmluZyAqZmlsZW5hbWUpCit0ZW1wbGF0ZTxzaXplX3QgTmFtZUNvdW50Pgorc3RhdGljIHZvaWQg d2hpdGVMaXN0SUROU2NyaXB0cyhzdGQ6OmFycmF5PGNvbnN0IGNoYXIqLCBOYW1lQ291bnQ+IHNj cmlwdE5hbWVzKQogewotICAgIGlmICghZmlsZW5hbWUpCi0gICAgICAgIHJldHVybiBOTzsKLQot ICAgIEZJTEUgKmZpbGUgPSBmb3BlbihbZmlsZW5hbWUgZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9u XSwgInIiKTsKLSAgICBpZiAoIWZpbGUpCi0gICAgICAgIHJldHVybiBOTzsKLSAgICAKLSAgICAv LyBSZWFkIGEgd29yZCBhdCBhIHRpbWUuCi0gICAgLy8gQWxsb3cgY29tbWVudHMsIHN0YXJ0aW5n IHdpdGggIyBjaGFyYWN0ZXIgdG8gdGhlIGVuZCBvZiB0aGUgbGluZS4KLSAgICB3aGlsZSAoMSkg ewotICAgICAgICAvLyBTa2lwIGEgY29tbWVudCBpZiBwcmVzZW50LgotICAgICAgICBpZiAoZnNj YW5mKGZpbGUsICIgIyUqW15cblxyXSUqW1xuXHJdIikgPT0gRU9GKQotICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgIAotICAgICAgICAvLyBSZWFkIGEgc2NyaXB0IG5hbWUgaWYgcHJlc2VudC4K LSAgICAgICAgY2hhciB3b3JkWzMzXTsKLSAgICAgICAgaW50IHJlc3VsdCA9IGZzY2FuZihmaWxl LCAiICUzMlteIyBcdFxuXHJdJSpbXiMgXHRcblxyXSAiLCB3b3JkKTsKLSAgICAgICAgaWYgKHJl c3VsdCA9PSBFT0YpCi0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgCi0gICAgICAgIGlmIChy ZXN1bHQgPT0gMSkgewotICAgICAgICAgICAgLy8gR290IGEgd29yZCwgbWFwIHRvIHNjcmlwdCBj b2RlIGFuZCBwdXQgaXQgaW50byB0aGUgYXJyYXkuCi0gICAgICAgICAgICBpbnQzMl90IHNjcmlw dCA9IHVfZ2V0UHJvcGVydHlWYWx1ZUVudW0oVUNIQVJfU0NSSVBULCB3b3JkKTsKLSAgICAgICAg ICAgIGlmIChzY3JpcHQgPj0gMCAmJiBzY3JpcHQgPCBVU0NSSVBUX0NPREVfTElNSVQpIHsKLSAg ICAgICAgICAgICAgICBzaXplX3QgaW5kZXggPSBzY3JpcHQgLyAzMjsKLSAgICAgICAgICAgICAg ICB1aW50MzJfdCBtYXNrID0gMSA8PCAoc2NyaXB0ICUgMzIpOwotICAgICAgICAgICAgICAgIElE TlNjcmlwdFdoaXRlTGlzdFtpbmRleF0gfD0gbWFzazsKLSAgICAgICAgICAgIH0KKyAgICBmb3Ig KGNvbnN0IGNoYXIqIHNjcmlwdE5hbWUgOiBzY3JpcHROYW1lcykgeworICAgICAgICBpbnQzMl90 IHNjcmlwdCA9IHVfZ2V0UHJvcGVydHlWYWx1ZUVudW0oVUNIQVJfU0NSSVBULCBzY3JpcHROYW1l KTsKKyAgICAgICAgaWYgKHNjcmlwdCA+PSAwICYmIHNjcmlwdCA8IFVTQ1JJUFRfQ09ERV9MSU1J VCkgeworICAgICAgICAgICAgc2l6ZV90IGluZGV4ID0gc2NyaXB0IC8gMzI7CisgICAgICAgICAg ICB1aW50MzJfdCBtYXNrID0gMSA8PCAoc2NyaXB0ICUgMzIpOworICAgICAgICAgICAgSUROU2Ny aXB0V2hpdGVMaXN0W2luZGV4XSB8PSBtYXNrOwogICAgICAgICB9CiAgICAgfQotICAgIGZjbG9z ZShmaWxlKTsKLSAgICByZXR1cm4gWUVTOwogfQogCiBzdGF0aWMgQk9PTCBhbGxDaGFyYWN0ZXJz SW5JRE5TY3JpcHRXaGl0ZUxpc3QoY29uc3QgVUNoYXIgKmJ1ZmZlciwgaW50MzJfdCBsZW5ndGgp CiB7CiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBmbGFnOwogICAgIGRpc3BhdGNoX29uY2Uo JmZsYWcsIF57Ci0gICAgICAgIC8vIFJlYWQgd2hpdGUgbGlzdCBmcm9tIGxpYnJhcnkuCi0gICAg ICAgIE5TQXJyYXkgKmRpcnMgPSBOU1NlYXJjaFBhdGhGb3JEaXJlY3Rvcmllc0luRG9tYWlucyhO U0xpYnJhcnlEaXJlY3RvcnksIE5TQWxsRG9tYWluc01hc2ssIFlFUyk7Ci0gICAgICAgIGludCBu dW1EaXJzID0gW2RpcnMgY291bnRdOwotICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IG51bURp cnM7IGkrKykgewotICAgICAgICAgICAgaWYgKHJlYWRJRE5TY3JpcHRXaGl0ZUxpc3RGaWxlKFtb ZGlycyBvYmplY3RBdEluZGV4OmldIHN0cmluZ0J5QXBwZW5kaW5nUGF0aENvbXBvbmVudDpAIklE TlNjcmlwdFdoaXRlTGlzdC50eHQiXSkpCi0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICB9Ci0KLSAgICAgICAgLy8gRmFsbCBiYWNrIG9uIHdoaXRlIGxpc3QgaW5zaWRlIGJ1bmRsZS4K LSAgICAgICAgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVXaXRoSWRlbnRpZmll cjpAImNvbS5hcHBsZS5XZWJDb3JlIl07Ci0KLSAgICAgICAgaWYgKCFyZWFkSUROU2NyaXB0V2hp dGVMaXN0RmlsZShbYnVuZGxlIHBhdGhGb3JSZXNvdXJjZTpAIklETlNjcmlwdFdoaXRlTGlzdCIg b2ZUeXBlOkAidHh0Il0pKQotICAgICAgICAgICAgQ1JBU0goKTsKKyAgICAgICAgd2hpdGVMaXN0 SUROU2NyaXB0cyh7CisgICAgICAgICAgICAiQ29tbW9uIiwKKyAgICAgICAgICAgICJJbmhlcml0 ZWQiLAorICAgICAgICAgICAgIkFyYWJpYyIsCisgICAgICAgICAgICAiQXJtZW5pYW4iLAorICAg ICAgICAgICAgIkJvcG9tb2ZvIiwKKyAgICAgICAgICAgICJDYW5hZGlhbl9BYm9yaWdpbmFsIiwK KyAgICAgICAgICAgICJEZXZhbmFnYXJpIiwKKyAgICAgICAgICAgICJEZXNlcmV0IiwKKyAgICAg ICAgICAgICJHdWphcmF0aSIsCisgICAgICAgICAgICAiR3VybXVraGkiLAorICAgICAgICAgICAg Ikhhbmd1bCIsCisgICAgICAgICAgICAiSGFuIiwKKyAgICAgICAgICAgICJIZWJyZXciLAorICAg ICAgICAgICAgIkhpcmFnYW5hIiwKKyAgICAgICAgICAgICJLYXRha2FuYV9Pcl9IaXJhZ2FuYSIs CisgICAgICAgICAgICAiS2F0YWthbmEiLAorICAgICAgICAgICAgIkxhdGluIiwKKyAgICAgICAg ICAgICJUYW1pbCIsCisgICAgICAgICAgICAiVGhhaSIsCisgICAgICAgICAgICAiWWkiCisgICAg ICAgIH0pOwogICAgIH0pOwogICAgIAogICAgIGludDMyX3QgaSA9IDA7Cg== 351307 2018-10-01 14:50:38 -0700 2018-10-01 16:08:12 -0700 Patch bug-190157-20181001145037.patch text/plain 8966 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNjY5MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE4LTEwLTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgcmVh ZCBmcm9tIGEgZmlsZSBmb3IgSUROU2NyaXB0V2hpdGVMaXN0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTAxNTcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuICBUaGlz IGluY3JlYXNlcyBwZXJmb3JtYW5jZSBieSBub3QgcmVhZGluZyBmcm9tIGEgZmlsZSwKKyAgICAg ICAgYW5kIGl0IG1ha2VzIGl0IHNvIHRoYXQgVVJMLXJlbGF0ZWQgZnVuY3Rpb25hbGl0eSBjYW4g YmUgbW92ZWQgdG8gYSBwbGFjZSB3aXRob3V0CisgICAgICAgIGEgYnVuZGxlIGZvciByZXNvdXJj ZXMuCisKKyAgICAgICAgKiBSZXNvdXJjZXMvSUROU2NyaXB0V2hpdGVMaXN0LnR4dDogUmVtb3Zl ZC4KKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAg ICogcGxhdGZvcm0vbWFjL1dlYkNvcmVOU1VSTEV4dHJhcy5tbToKKyAgICAgICAgKFdlYkNvcmU6 OndoaXRlTGlzdElETlNjcmlwdHMpOgorICAgICAgICAoV2ViQ29yZTo6YWxsQ2hhcmFjdGVyc0lu SUROU2NyaXB0V2hpdGVMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OnJlYWRJRE5TY3JpcHRXaGl0 ZUxpc3RGaWxlKTogRGVsZXRlZC4KKwogMjAxOC0xMC0wMSAgU2lodWkgTGl1ICA8c2lodWlfbGl1 QGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgU3RvcmFnZVByb2Nlc3MKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL1Jlc291cmNlcy9JRE5TY3JpcHRXaGl0ZUxpc3QudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL1Jlc291cmNlcy9JRE5TY3JpcHRXaGl0ZUxpc3QudHh0CShyZXZpc2lv biAyMzY2NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvSUROU2NyaXB0V2hpdGVMaXN0 LnR4dAkobm9uZXhpc3RlbnQpCkBAIC0xLDIzICswLDAgQEAKLSMgRGVmYXVsdCBXZWIgS2l0IElu dGVybmF0aW9uYWwgRG9tYWluIE5hbWUgU2NyaXB0IFdoaXRlIExpc3QuCi0KLUNvbW1vbgotSW5o ZXJpdGVkCi0KLUFyYWJpYwotQXJtZW5pYW4KLUJvcG9tb2ZvCi1DYW5hZGlhbl9BYm9yaWdpbmFs Ci1EZXZhbmFnYXJpCi1EZXNlcmV0Ci1HdWphcmF0aQotR3VybXVraGkKLUhhbmd1bAotSGFuCi1I ZWJyZXcKLUhpcmFnYW5hCi1LYXRha2FuYV9Pcl9IaXJhZ2FuYQotS2F0YWthbmEKLUxhdGluCi1U YW1pbAotVGhhaQotWWkKClByb3BlcnR5IGNoYW5nZXMgb246IFNvdXJjZS9XZWJDb3JlL1Jlc291 cmNlcy9JRE5TY3JpcHRXaGl0ZUxpc3QudHh0Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KRGVsZXRlZDogc3ZuOmVvbC1z dHlsZQojIyAtMSArMCwwICMjCi1uYXRpdmUKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0 eQpJbmRleDogU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagkocmV2aXNpb24gMjM2NjczKQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3b3JraW5nIGNvcHkpCkBAIC0yMjU0LDcgKzIyNTQsNiBA QAogCQk3Q0MyREUwMzFFQ0EwNEE1MDAyN0I3NzQgLyogTm90aWZpY2F0aW9uRGlyZWN0aW9uLmgg aW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0MyREUwMjFF Q0EwNEE1MDAyN0I3NzQgLyogTm90aWZpY2F0aW9uRGlyZWN0aW9uLmggKi87IHNldHRpbmdzID0g e0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJN0NDNTY0QjgxOEJBQkVBNjAwMUI5 NjUyIC8qIFRlbGVwaG9uZU51bWJlckRldGVjdG9yLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0M1NjRCNjE4QkFCRUE2MDAxQjk2NTIgLyogVGVsZXBo b25lTnVtYmVyRGV0ZWN0b3IuaCAqLzsgfTsKIAkJN0NDNjk5NDExOTFFQzVGNTAwQUYyMjcwIC8q IEpTV2ViS2l0TmFtZXNwYWNlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSA3Q0M2OTkzRjE5MUVDNUY1MDBBRjIyNzAgLyogSlNXZWJLaXROYW1lc3BhY2Uu aCAqLzsgfTsKLQkJN0NDN0UzRDcxNzIwOEMwRjAwM0M1Mjc3IC8qIElETlNjcmlwdFdoaXRlTGlz dC50eHQgaW4gUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdD QzdFM0Q2MTcyMDhDMEYwMDNDNTI3NyAvKiBJRE5TY3JpcHRXaGl0ZUxpc3QudHh0ICovOyB9Owog CQk3Q0M5NzIyRTFGOTNFMzM2MDAwNEQ0Q0YgLyogU2V0dGluZ3NCYXNlLmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0M2NjA5OTFGOTMwNTc4MDBENTAw RTkgLyogU2V0dGluZ3NCYXNlLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0 ZSwgKTsgfTsgfTsKIAkJN0NDRUJGQzAxREQ4RjZBQjAwMkM0MEI4IC8qIFNWR0xlbmd0aFZhbHVl LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0U1OEQ1 MzFERDdCMDkzMDAxMjg1NTIgLyogU1ZHTGVuZ3RoVmFsdWUuaCAqLzsgc2V0dGluZ3MgPSB7QVRU UklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQk3Q0QwQkEwNTFCOEY3OUM5MDA1Q0VCQkUg LyogQWN0aXZlRE9NQ2FsbGJhY2tNaWNyb3Rhc2suaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDRDBCQTAzMUI4Rjc5QzkwMDVDRUJCRSAvKiBBY3RpdmVE T01DYWxsYmFja01pY3JvdGFzay5oICovOyB9OwpAQCAtOTY4MSw3ICs5NjgwLDYgQEAKIAkJN0ND NjYwOUIxRjkzMDU3OTAwRDUwMEU5IC8qIFNldHRpbmdzQmFzZS5jcHAgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBTZXR0aW5nc0Jhc2UuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQk3Q0M2OTkzRTE5MUVDNUY1MDBBRjIyNzAgLyogSlNXZWJLaXROYW1lc3Bh Y2UuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNXZWJLaXROYW1l c3BhY2UuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3Q0M2OTkzRjE5MUVDNUY1 MDBBRjIyNzAgLyogSlNXZWJLaXROYW1lc3BhY2UuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5o OyBwYXRoID0gSlNXZWJLaXROYW1lc3BhY2UuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK LQkJN0NDN0UzRDYxNzIwOEMwRjAwM0M1Mjc3IC8qIElETlNjcmlwdFdoaXRlTGlzdC50eHQgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSB0ZXh0OyBwYXRoID0gSUROU2NyaXB0V2hpdGVMaXN0LnR4dDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKIAkJN0NEMEJBMDIxQjhGNzlDOTAwNUNFQkJFIC8qIEFjdGl2ZURPTUNh bGxiYWNrTWljcm90YXNrLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9 IEFjdGl2ZURPTUNhbGxiYWNrTWljcm90YXNrLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJN0NEMEJBMDMxQjhGNzlDOTAwNUNFQkJFIC8qIEFjdGl2ZURPTUNhbGxiYWNrTWljcm90 YXNrLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEFjdGl2ZURPTUNhbGxiYWNr TWljcm90YXNrLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdDRDBFMkI1MUY4MEE0 ODIwMDE2QTRDRSAvKiBBYm9ydENvbnRyb2xsZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQWJvcnRDb250 cm9sbGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xNTc2NSw3ICsxNTc2Myw2 IEBACiAJCQkJNjU5OThBNjUwRTVGNUZEMzAwNEUwOTdBIC8qIGltYWdlcyAqLywKIAkJCQlBMUFB OUFCODFEMjM5MTE1MDBGRUFEQjMgLyogQ29udGVudEZpbHRlckJsb2NrZWRQYWdlLmh0bWwgKi8s CiAJCQkJQTExRThDMDAxQjFFMjhCRTAwMDNBN0M3IC8qIGNvcHlDdXJzb3IucG5nICovLAotCQkJ CTdDQzdFM0Q2MTcyMDhDMEYwMDNDNTI3NyAvKiBJRE5TY3JpcHRXaGl0ZUxpc3QudHh0ICovLAog CQkJCTJEOUYwRTEyMTRGRjFDQkYwMEJBMEZGNyAvKiBsaW5lYXJTUkdCLmljYyAqLywKIAkJCQlC Q0FEMTgwODEzMUM3QTBEMDA5OTA0MDYgLyogTG9jYWxpemFibGUuc3RyaW5ncyAqLywKIAkJCQk4 MzdBODAxMTFFMUUxMjczMDAwMjZCOUYgLyogTG9jYWxpemFibGUuc3RyaW5nc2RpY3QgKi8sCkBA IC0zMTM3OCw3ICszMTM3NSw2IEBACiAJCQkJMkQ1MEE0QjgxQ0UxMEUwMDAwMTk4MDQ5IC8qIEF0 dGFjaG1lbnRQbGFjZWhvbGRlckAyeC5wbmcgaW4gUmVzb3VyY2VzICovLAogCQkJCUExQUE5QUI5 MUQyMzkxMTUwMEZFQURCMyAvKiBDb250ZW50RmlsdGVyQmxvY2tlZFBhZ2UuaHRtbCBpbiBSZXNv dXJjZXMgKi8sCiAJCQkJQTExRThDMDUxQjFFMjhGNDAwMDNBN0M3IC8qIGNvcHlDdXJzb3IucG5n IGluIFJlc291cmNlcyAqLywKLQkJCQk3Q0M3RTNENzE3MjA4QzBGMDAzQzUyNzcgLyogSUROU2Ny aXB0V2hpdGVMaXN0LnR4dCBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJMkQ5RjBFMTMxNEZGMUNCRjAw QkEwRkY3IC8qIGxpbmVhclNSR0IuaWNjIGluIFJlc291cmNlcyAqLywKIAkJCQlFNTlERDRCODIx MDk4Mjg3MDAzQzhCNDcgLyogTGlzdEJ1dHRvbkFycm93LnBuZyBpbiBSZXNvdXJjZXMgKi8sCiAJ CQkJRTUxNjY5OTEyMEZGOTkxODAwOUQyQzI3IC8qIExpc3RCdXR0b25BcnJvd0AyeC5wbmcgaW4g UmVzb3VyY2VzICovLApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVO U1VSTEV4dHJhcy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv V2ViQ29yZU5TVVJMRXh0cmFzLm1tCShyZXZpc2lvbiAyMzY2NzMpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZU5TVVJMRXh0cmFzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0y NDcsNTkgKzI0Nyw0NCBAQCBzdGF0aWMgQk9PTCBpc0xvb2thbGlrZUNoYXJhY3RlcihzdGQ6Om9w CiAgICAgfQogfQogCi1zdGF0aWMgQk9PTCByZWFkSUROU2NyaXB0V2hpdGVMaXN0RmlsZShOU1N0 cmluZyAqZmlsZW5hbWUpCi17Ci0gICAgaWYgKCFmaWxlbmFtZSkKLSAgICAgICAgcmV0dXJuIE5P OwotCi0gICAgRklMRSAqZmlsZSA9IGZvcGVuKFtmaWxlbmFtZSBmaWxlU3lzdGVtUmVwcmVzZW50 YXRpb25dLCAiciIpOwotICAgIGlmICghZmlsZSkKLSAgICAgICAgcmV0dXJuIE5POwotICAgIAot ICAgIC8vIFJlYWQgYSB3b3JkIGF0IGEgdGltZS4KLSAgICAvLyBBbGxvdyBjb21tZW50cywgc3Rh cnRpbmcgd2l0aCAjIGNoYXJhY3RlciB0byB0aGUgZW5kIG9mIHRoZSBsaW5lLgotICAgIHdoaWxl ICgxKSB7Ci0gICAgICAgIC8vIFNraXAgYSBjb21tZW50IGlmIHByZXNlbnQuCi0gICAgICAgIGlm IChmc2NhbmYoZmlsZSwgIiAjJSpbXlxuXHJdJSpbXG5ccl0iKSA9PSBFT0YpCi0gICAgICAgICAg ICBicmVhazsKLSAgICAgICAgCi0gICAgICAgIC8vIFJlYWQgYSBzY3JpcHQgbmFtZSBpZiBwcmVz ZW50LgotICAgICAgICBjaGFyIHdvcmRbMzNdOwotICAgICAgICBpbnQgcmVzdWx0ID0gZnNjYW5m KGZpbGUsICIgJTMyW14jIFx0XG5ccl0lKlteIyBcdFxuXHJdICIsIHdvcmQpOwotICAgICAgICBp ZiAocmVzdWx0ID09IEVPRikKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAKLSAgICAgICAg aWYgKHJlc3VsdCA9PSAxKSB7Ci0gICAgICAgICAgICAvLyBHb3QgYSB3b3JkLCBtYXAgdG8gc2Ny aXB0IGNvZGUgYW5kIHB1dCBpdCBpbnRvIHRoZSBhcnJheS4KLSAgICAgICAgICAgIGludDMyX3Qg c2NyaXB0ID0gdV9nZXRQcm9wZXJ0eVZhbHVlRW51bShVQ0hBUl9TQ1JJUFQsIHdvcmQpOwotICAg ICAgICAgICAgaWYgKHNjcmlwdCA+PSAwICYmIHNjcmlwdCA8IFVTQ1JJUFRfQ09ERV9MSU1JVCkg ewotICAgICAgICAgICAgICAgIHNpemVfdCBpbmRleCA9IHNjcmlwdCAvIDMyOwotICAgICAgICAg ICAgICAgIHVpbnQzMl90IG1hc2sgPSAxIDw8IChzY3JpcHQgJSAzMik7Ci0gICAgICAgICAgICAg ICAgSUROU2NyaXB0V2hpdGVMaXN0W2luZGV4XSB8PSBtYXNrOwotICAgICAgICAgICAgfQotICAg ICAgICB9Ci0gICAgfQotICAgIGZjbG9zZShmaWxlKTsKLSAgICByZXR1cm4gWUVTOwotfQotCiBz dGF0aWMgQk9PTCBhbGxDaGFyYWN0ZXJzSW5JRE5TY3JpcHRXaGl0ZUxpc3QoY29uc3QgVUNoYXIg KmJ1ZmZlciwgaW50MzJfdCBsZW5ndGgpCiB7CiAgICAgc3RhdGljIGRpc3BhdGNoX29uY2VfdCBm bGFnOwogICAgIGRpc3BhdGNoX29uY2UoJmZsYWcsIF57Ci0gICAgICAgIC8vIFJlYWQgd2hpdGUg bGlzdCBmcm9tIGxpYnJhcnkuCi0gICAgICAgIE5TQXJyYXkgKmRpcnMgPSBOU1NlYXJjaFBhdGhG b3JEaXJlY3Rvcmllc0luRG9tYWlucyhOU0xpYnJhcnlEaXJlY3RvcnksIE5TQWxsRG9tYWluc01h c2ssIFlFUyk7Ci0gICAgICAgIGludCBudW1EaXJzID0gW2RpcnMgY291bnRdOwotICAgICAgICBm b3IgKGludCBpID0gMDsgaSA8IG51bURpcnM7IGkrKykgewotICAgICAgICAgICAgaWYgKHJlYWRJ RE5TY3JpcHRXaGl0ZUxpc3RGaWxlKFtbZGlycyBvYmplY3RBdEluZGV4OmldIHN0cmluZ0J5QXBw ZW5kaW5nUGF0aENvbXBvbmVudDpAIklETlNjcmlwdFdoaXRlTGlzdC50eHQiXSkpCi0gICAgICAg ICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgLy8gRmFsbCBiYWNrIG9uIHdo aXRlIGxpc3QgaW5zaWRlIGJ1bmRsZS4KLSAgICAgICAgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1 bmRsZSBidW5kbGVXaXRoSWRlbnRpZmllcjpAImNvbS5hcHBsZS5XZWJDb3JlIl07Ci0KLSAgICAg ICAgaWYgKCFyZWFkSUROU2NyaXB0V2hpdGVMaXN0RmlsZShbYnVuZGxlIHBhdGhGb3JSZXNvdXJj ZTpAIklETlNjcmlwdFdoaXRlTGlzdCIgb2ZUeXBlOkAidHh0Il0pKQotICAgICAgICAgICAgQ1JB U0goKTsKKyAgICAgICAgCisgICAgICAgIGF1dG8gd2hpdGVMaXN0SUROU2NyaXB0cyA9IFtdIChz dGQ6OmFycmF5PGNvbnN0IGNoYXIqLCAyMD4gc2NyaXB0TmFtZXMpIHsKKyAgICAgICAgICAgIGZv ciAoY29uc3QgY2hhciogc2NyaXB0TmFtZSA6IHNjcmlwdE5hbWVzKSB7CisgICAgICAgICAgICAg ICAgaW50MzJfdCBzY3JpcHQgPSB1X2dldFByb3BlcnR5VmFsdWVFbnVtKFVDSEFSX1NDUklQVCwg c2NyaXB0TmFtZSk7CisgICAgICAgICAgICAgICAgaWYgKHNjcmlwdCA+PSAwICYmIHNjcmlwdCA8 IFVTQ1JJUFRfQ09ERV9MSU1JVCkgeworICAgICAgICAgICAgICAgICAgICBzaXplX3QgaW5kZXgg PSBzY3JpcHQgLyAzMjsKKyAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgbWFzayA9IDEgPDwg KHNjcmlwdCAlIDMyKTsKKyAgICAgICAgICAgICAgICAgICAgSUROU2NyaXB0V2hpdGVMaXN0W2lu ZGV4XSB8PSBtYXNrOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAg fTsKKyAgICAgICAgCisgICAgICAgIHdoaXRlTGlzdElETlNjcmlwdHMoeworICAgICAgICAgICAg IkNvbW1vbiIsCisgICAgICAgICAgICAiSW5oZXJpdGVkIiwKKyAgICAgICAgICAgICJBcmFiaWMi LAorICAgICAgICAgICAgIkFybWVuaWFuIiwKKyAgICAgICAgICAgICJCb3BvbW9mbyIsCisgICAg ICAgICAgICAiQ2FuYWRpYW5fQWJvcmlnaW5hbCIsCisgICAgICAgICAgICAiRGV2YW5hZ2FyaSIs CisgICAgICAgICAgICAiRGVzZXJldCIsCisgICAgICAgICAgICAiR3VqYXJhdGkiLAorICAgICAg ICAgICAgIkd1cm11a2hpIiwKKyAgICAgICAgICAgICJIYW5ndWwiLAorICAgICAgICAgICAgIkhh biIsCisgICAgICAgICAgICAiSGVicmV3IiwKKyAgICAgICAgICAgICJIaXJhZ2FuYSIsCisgICAg ICAgICAgICAiS2F0YWthbmFfT3JfSGlyYWdhbmEiLAorICAgICAgICAgICAgIkthdGFrYW5hIiwK KyAgICAgICAgICAgICJMYXRpbiIsCisgICAgICAgICAgICAiVGFtaWwiLAorICAgICAgICAgICAg IlRoYWkiLAorICAgICAgICAgICAgIllpIgorICAgICAgICB9KTsKICAgICB9KTsKICAgICAKICAg ICBpbnQzMl90IGkgPSAwOwo= 351319 2018-10-01 16:08:13 -0700 2018-10-01 17:13:13 -0700 Patch bug-190157-20181001160812.patch text/plain 8120 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNjY5MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE4LTEwLTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgcmVh ZCBmcm9tIFdlYkNvcmUncyBidW5kbGUgZm9yIElETlNjcmlwdFdoaXRlTGlzdAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkwMTU3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2 aW9yLiAgVGhpcyBpbmNyZWFzZXMgcGVyZm9ybWFuY2UgYnkgbm90IHJlYWRpbmcgZnJvbSB0aGUg V2ViQ29yZSBidW5kbGUsCisgICAgICAgIGFuZCBpdCBtYWtlcyBpdCBzbyB0aGF0IFVSTC1yZWxh dGVkIGZ1bmN0aW9uYWxpdHkgY2FuIGJlIG1vdmVkIHRvIGEgcGxhY2Ugd2l0aG91dAorICAgICAg ICBhIGJ1bmRsZSBmb3IgcmVzb3VyY2VzLgorCisgICAgICAgICogUmVzb3VyY2VzL0lETlNjcmlw dFdoaXRlTGlzdC50eHQ6IFJlbW92ZWQuCisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJDb3JlTlNVUkxFeHRyYXMu bW06CisgICAgICAgIChXZWJDb3JlOjp3aGl0ZUxpc3RJRE5TY3JpcHRzKToKKyAgICAgICAgKFdl YkNvcmU6OmFsbENoYXJhY3RlcnNJbklETlNjcmlwdFdoaXRlTGlzdCk6CisgICAgICAgIChXZWJD b3JlOjpyZWFkSUROU2NyaXB0V2hpdGVMaXN0RmlsZSk6IERlbGV0ZWQuCisKIDIwMTgtMTAtMDEg IFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIFN0b3Jh Z2VQcm9jZXNzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvSUROU2NyaXB0V2hpdGVM aXN0LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvSUROU2NyaXB0 V2hpdGVMaXN0LnR4dAkocmV2aXNpb24gMjM2NjczKQorKysgU291cmNlL1dlYkNvcmUvUmVzb3Vy Y2VzL0lETlNjcmlwdFdoaXRlTGlzdC50eHQJKG5vbmV4aXN0ZW50KQpAQCAtMSwyMyArMCwwIEBA Ci0jIERlZmF1bHQgV2ViIEtpdCBJbnRlcm5hdGlvbmFsIERvbWFpbiBOYW1lIFNjcmlwdCBXaGl0 ZSBMaXN0LgotCi1Db21tb24KLUluaGVyaXRlZAotCi1BcmFiaWMKLUFybWVuaWFuCi1Cb3BvbW9m bwotQ2FuYWRpYW5fQWJvcmlnaW5hbAotRGV2YW5hZ2FyaQotRGVzZXJldAotR3VqYXJhdGkKLUd1 cm11a2hpCi1IYW5ndWwKLUhhbgotSGVicmV3Ci1IaXJhZ2FuYQotS2F0YWthbmFfT3JfSGlyYWdh bmEKLUthdGFrYW5hCi1MYXRpbgotVGFtaWwKLVRoYWkKLVlpCgpQcm9wZXJ0eSBjaGFuZ2VzIG9u OiBTb3VyY2UvV2ViQ29yZS9SZXNvdXJjZXMvSUROU2NyaXB0V2hpdGVMaXN0LnR4dApfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkRlbGV0ZWQ6IHN2bjplb2wtc3R5bGUKIyMgLTEgKzAsMCAjIwotbmF0aXZlClwgTm8gbmV3 bGluZSBhdCBlbmQgb2YgcHJvcGVydHkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJldmlzaW9uIDIzNjY3MykKKysrIFNvdXJj ZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkod29ya2luZyBjb3B5 KQpAQCAtMjI1NCw3ICsyMjU0LDYgQEAKIAkJN0NDMkRFMDMxRUNBMDRBNTAwMjdCNzc0IC8qIE5v dGlmaWNhdGlvbkRpcmVjdGlvbi5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gN0NDMkRFMDIxRUNBMDRBNTAwMjdCNzc0IC8qIE5vdGlmaWNhdGlvbkRpcmVj dGlvbi5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJ CTdDQzU2NEI4MThCQUJFQTYwMDFCOTY1MiAvKiBUZWxlcGhvbmVOdW1iZXJEZXRlY3Rvci5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0NDNTY0QjYxOEJB QkVBNjAwMUI5NjUyIC8qIFRlbGVwaG9uZU51bWJlckRldGVjdG9yLmggKi87IH07CiAJCTdDQzY5 OTQxMTkxRUM1RjUwMEFGMjI3MCAvKiBKU1dlYktpdE5hbWVzcGFjZS5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0NDNjk5M0YxOTFFQzVGNTAwQUYyMjcw IC8qIEpTV2ViS2l0TmFtZXNwYWNlLmggKi87IH07Ci0JCTdDQzdFM0Q3MTcyMDhDMEYwMDNDNTI3 NyAvKiBJRE5TY3JpcHRXaGl0ZUxpc3QudHh0IGluIFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0M3RTNENjE3MjA4QzBGMDAzQzUyNzcgLyogSUROU2NyaXB0 V2hpdGVMaXN0LnR4dCAqLzsgfTsKIAkJN0NDOTcyMkUxRjkzRTMzNjAwMDRENENGIC8qIFNldHRp bmdzQmFzZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g N0NDNjYwOTkxRjkzMDU3ODAwRDUwMEU5IC8qIFNldHRpbmdzQmFzZS5oICovOyBzZXR0aW5ncyA9 IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTdDQ0VCRkMwMUREOEY2QUIwMDJD NDBCOCAvKiBTVkdMZW5ndGhWYWx1ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gN0NFNThENTMxREQ3QjA5MzAwMTI4NTUyIC8qIFNWR0xlbmd0aFZhbHVl LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJN0NE MEJBMDUxQjhGNzlDOTAwNUNFQkJFIC8qIEFjdGl2ZURPTUNhbGxiYWNrTWljcm90YXNrLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0QwQkEwMzFCOEY3 OUM5MDA1Q0VCQkUgLyogQWN0aXZlRE9NQ2FsbGJhY2tNaWNyb3Rhc2suaCAqLzsgfTsKQEAgLTk2 ODEsNyArOTY4MCw2IEBACiAJCTdDQzY2MDlCMUY5MzA1NzkwMEQ1MDBFOSAvKiBTZXR0aW5nc0Jh c2UuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gU2V0dGluZ3NCYXNl LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0NDNjk5M0UxOTFFQzVGNTAwQUYy MjcwIC8qIEpTV2ViS2l0TmFtZXNwYWNlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNw cDsgcGF0aCA9IEpTV2ViS2l0TmFtZXNwYWNlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJN0NDNjk5M0YxOTFFQzVGNTAwQUYyMjcwIC8qIEpTV2ViS2l0TmFtZXNwYWNlLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IEpTV2ViS2l0TmFtZXNwYWNlLmg7IHNvdXJj ZVRyZWUgPSAiPGdyb3VwPiI7IH07Ci0JCTdDQzdFM0Q2MTcyMDhDMEYwMDNDNTI3NyAvKiBJRE5T Y3JpcHRXaGl0ZUxpc3QudHh0ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IElETlNjcmlwdFdoaXRl TGlzdC50eHQ7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdDRDBCQTAyMUI4Rjc5Qzkw MDVDRUJCRSAvKiBBY3RpdmVET01DYWxsYmFja01pY3JvdGFzay5jcHAgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBBY3RpdmVET01DYWxsYmFja01pY3JvdGFzay5jcHA7IHNv dXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdDRDBCQTAzMUI4Rjc5QzkwMDVDRUJCRSAvKiBB Y3RpdmVET01DYWxsYmFja01pY3JvdGFzay5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBBY3RpdmVET01DYWxsYmFja01pY3JvdGFzay5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQk3Q0QwRTJCNTFGODBBNDgyMDAxNkE0Q0UgLyogQWJvcnRDb250cm9sbGVyLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IEFib3J0Q29udHJvbGxlci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwpAQCAtMTU3NjUsNyArMTU3NjMsNiBAQAogCQkJCTY1OTk4QTY1MEU1RjVGRDMwMDRFMDk3QSAv KiBpbWFnZXMgKi8sCiAJCQkJQTFBQTlBQjgxRDIzOTExNTAwRkVBREIzIC8qIENvbnRlbnRGaWx0 ZXJCbG9ja2VkUGFnZS5odG1sICovLAogCQkJCUExMUU4QzAwMUIxRTI4QkUwMDAzQTdDNyAvKiBj b3B5Q3Vyc29yLnBuZyAqLywKLQkJCQk3Q0M3RTNENjE3MjA4QzBGMDAzQzUyNzcgLyogSUROU2Ny aXB0V2hpdGVMaXN0LnR4dCAqLywKIAkJCQkyRDlGMEUxMjE0RkYxQ0JGMDBCQTBGRjcgLyogbGlu ZWFyU1JHQi5pY2MgKi8sCiAJCQkJQkNBRDE4MDgxMzFDN0EwRDAwOTkwNDA2IC8qIExvY2FsaXph YmxlLnN0cmluZ3MgKi8sCiAJCQkJODM3QTgwMTExRTFFMTI3MzAwMDI2QjlGIC8qIExvY2FsaXph YmxlLnN0cmluZ3NkaWN0ICovLApAQCAtMzEzNzgsNyArMzEzNzUsNiBAQAogCQkJCTJENTBBNEI4 MUNFMTBFMDAwMDE5ODA0OSAvKiBBdHRhY2htZW50UGxhY2Vob2xkZXJAMngucG5nIGluIFJlc291 cmNlcyAqLywKIAkJCQlBMUFBOUFCOTFEMjM5MTE1MDBGRUFEQjMgLyogQ29udGVudEZpbHRlckJs b2NrZWRQYWdlLmh0bWwgaW4gUmVzb3VyY2VzICovLAogCQkJCUExMUU4QzA1MUIxRTI4RjQwMDAz QTdDNyAvKiBjb3B5Q3Vyc29yLnBuZyBpbiBSZXNvdXJjZXMgKi8sCi0JCQkJN0NDN0UzRDcxNzIw OEMwRjAwM0M1Mjc3IC8qIElETlNjcmlwdFdoaXRlTGlzdC50eHQgaW4gUmVzb3VyY2VzICovLAog CQkJCTJEOUYwRTEzMTRGRjFDQkYwMEJBMEZGNyAvKiBsaW5lYXJTUkdCLmljYyBpbiBSZXNvdXJj ZXMgKi8sCiAJCQkJRTU5REQ0QjgyMTA5ODI4NzAwM0M4QjQ3IC8qIExpc3RCdXR0b25BcnJvdy5w bmcgaW4gUmVzb3VyY2VzICovLAogCQkJCUU1MTY2OTkxMjBGRjk5MTgwMDlEMkMyNyAvKiBMaXN0 QnV0dG9uQXJyb3dAMngucG5nIGluIFJlc291cmNlcyAqLywKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9XZWJDb3JlTlNVUkxFeHRyYXMubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVOU1VSTEV4dHJhcy5tbQkocmV2aXNpb24gMjM2 NjczKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVOU1VSTEV4dHJhcy5t bQkod29ya2luZyBjb3B5KQpAQCAtMjQ3LDYgKzI0NywxNiBAQCBzdGF0aWMgQk9PTCBpc0xvb2th bGlrZUNoYXJhY3RlcihzdGQ6Om9wCiAgICAgfQogfQogCitzdGF0aWMgdm9pZCB3aGl0ZUxpc3RJ RE5TY3JpcHQoY29uc3QgY2hhciogc2NyaXB0TmFtZSkKK3sKKyAgICBpbnQzMl90IHNjcmlwdCA9 IHVfZ2V0UHJvcGVydHlWYWx1ZUVudW0oVUNIQVJfU0NSSVBULCBzY3JpcHROYW1lKTsKKyAgICBp ZiAoc2NyaXB0ID49IDAgJiYgc2NyaXB0IDwgVVNDUklQVF9DT0RFX0xJTUlUKSB7CisgICAgICAg IHNpemVfdCBpbmRleCA9IHNjcmlwdCAvIDMyOworICAgICAgICB1aW50MzJfdCBtYXNrID0gMSA8 PCAoc2NyaXB0ICUgMzIpOworICAgICAgICBJRE5TY3JpcHRXaGl0ZUxpc3RbaW5kZXhdIHw9IG1h c2s7CisgICAgfQorfQorCiBzdGF0aWMgQk9PTCByZWFkSUROU2NyaXB0V2hpdGVMaXN0RmlsZShO U1N0cmluZyAqZmlsZW5hbWUpCiB7CiAgICAgaWYgKCFmaWxlbmFtZSkKQEAgLTI3MSwxMiArMjgx LDcgQEAgc3RhdGljIEJPT0wgcmVhZElETlNjcmlwdFdoaXRlTGlzdEZpbGUoTgogICAgICAgICAK ICAgICAgICAgaWYgKHJlc3VsdCA9PSAxKSB7CiAgICAgICAgICAgICAvLyBHb3QgYSB3b3JkLCBt YXAgdG8gc2NyaXB0IGNvZGUgYW5kIHB1dCBpdCBpbnRvIHRoZSBhcnJheS4KLSAgICAgICAgICAg IGludDMyX3Qgc2NyaXB0ID0gdV9nZXRQcm9wZXJ0eVZhbHVlRW51bShVQ0hBUl9TQ1JJUFQsIHdv cmQpOwotICAgICAgICAgICAgaWYgKHNjcmlwdCA+PSAwICYmIHNjcmlwdCA8IFVTQ1JJUFRfQ09E RV9MSU1JVCkgewotICAgICAgICAgICAgICAgIHNpemVfdCBpbmRleCA9IHNjcmlwdCAvIDMyOwot ICAgICAgICAgICAgICAgIHVpbnQzMl90IG1hc2sgPSAxIDw8IChzY3JpcHQgJSAzMik7Ci0gICAg ICAgICAgICAgICAgSUROU2NyaXB0V2hpdGVMaXN0W2luZGV4XSB8PSBtYXNrOwotICAgICAgICAg ICAgfQorICAgICAgICAgICAgd2hpdGVMaXN0SUROU2NyaXB0KHdvcmQpOwogICAgICAgICB9CiAg ICAgfQogICAgIGZjbG9zZShmaWxlKTsKQEAgLTI5NCwxMiArMjk5LDMwIEBAIHN0YXRpYyBCT09M IGFsbENoYXJhY3RlcnNJbklETlNjcmlwdFdoaXQKICAgICAgICAgICAgIGlmIChyZWFkSUROU2Ny aXB0V2hpdGVMaXN0RmlsZShbW2RpcnMgb2JqZWN0QXRJbmRleDppXSBzdHJpbmdCeUFwcGVuZGlu Z1BhdGhDb21wb25lbnQ6QCJJRE5TY3JpcHRXaGl0ZUxpc3QudHh0Il0pKQogICAgICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQotCi0gICAgICAgIC8vIEZhbGwgYmFjayBvbiB3aGl0ZSBs aXN0IGluc2lkZSBidW5kbGUuCi0gICAgICAgIE5TQnVuZGxlICpidW5kbGUgPSBbTlNCdW5kbGUg YnVuZGxlV2l0aElkZW50aWZpZXI6QCJjb20uYXBwbGUuV2ViQ29yZSJdOwotCi0gICAgICAgIGlm ICghcmVhZElETlNjcmlwdFdoaXRlTGlzdEZpbGUoW2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJJ RE5TY3JpcHRXaGl0ZUxpc3QiIG9mVHlwZTpAInR4dCJdKSkKLSAgICAgICAgICAgIENSQVNIKCk7 CisgICAgICAgIGNvbnN0IGNoYXIqIGRlZmF1bHRJRE5TY3JpcHRXaGl0ZUxpc3RbMjBdID0gewor ICAgICAgICAgICAgIkNvbW1vbiIsCisgICAgICAgICAgICAiSW5oZXJpdGVkIiwKKyAgICAgICAg ICAgICJBcmFiaWMiLAorICAgICAgICAgICAgIkFybWVuaWFuIiwKKyAgICAgICAgICAgICJCb3Bv bW9mbyIsCisgICAgICAgICAgICAiQ2FuYWRpYW5fQWJvcmlnaW5hbCIsCisgICAgICAgICAgICAi RGV2YW5hZ2FyaSIsCisgICAgICAgICAgICAiRGVzZXJldCIsCisgICAgICAgICAgICAiR3VqYXJh dGkiLAorICAgICAgICAgICAgIkd1cm11a2hpIiwKKyAgICAgICAgICAgICJIYW5ndWwiLAorICAg ICAgICAgICAgIkhhbiIsCisgICAgICAgICAgICAiSGVicmV3IiwKKyAgICAgICAgICAgICJIaXJh Z2FuYSIsCisgICAgICAgICAgICAiS2F0YWthbmFfT3JfSGlyYWdhbmEiLAorICAgICAgICAgICAg IkthdGFrYW5hIiwKKyAgICAgICAgICAgICJMYXRpbiIsCisgICAgICAgICAgICAiVGFtaWwiLAor ICAgICAgICAgICAgIlRoYWkiLAorICAgICAgICAgICAgIllpIiwKKyAgICAgICAgfTsKKyAgICAg ICAgZm9yIChjb25zdCBjaGFyKiBzY3JpcHROYW1lIDogZGVmYXVsdElETlNjcmlwdFdoaXRlTGlz dCkKKyAgICAgICAgICAgIHdoaXRlTGlzdElETlNjcmlwdChzY3JpcHROYW1lKTsKICAgICB9KTsK ICAgICAKICAgICBpbnQzMl90IGkgPSAwOwo=