125038 2013-11-30 20:07:56 -0800 [CTTE] The WebPageProxy's WebPageGroup is never null so it should be stored in a Ref 2013-11-30 22:37:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam eflews.bot gyuyoung.kim oldest_to_newest 955109 0 sam 2013-11-30 20:07:56 -0800 [CTTE] The WebPageProxy's WebPageGroup is never null so it should be stored in a Ref 955110 1 218100 sam 2013-11-30 20:08:22 -0800 Created attachment 218100 Patch 955111 2 218100 eflews.bot 2013-11-30 20:15:49 -0800 Comment on attachment 218100 Patch Attachment 218100 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/39058237 955131 3 sam 2013-11-30 22:37:40 -0800 Committed r159896: <http://trac.webkit.org/changeset/159896> 218100 2013-11-30 20:08:22 -0800 2013-11-30 22:33:53 -0800 Patch bug-125038-20131130200822.patch text/plain 18816 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1OTg5MykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ5IEBACisyMDEzLTExLTMwICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NUVEVdIFRoZSBXZWJQYWdlUHJveHkn cyBXZWJQYWdlR3JvdXAgaXMgbmV2ZXIgbnVsbCBzbyBpdCBzaG91bGQgYmUgc3RvcmVkIGluIGEg UmVmCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjUw MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwOgorICAgICAgICAoV0tQYWdlR2V0UGFnZUdyb3VwKToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvbWFjL1dLUGFnZVByaXZhdGVNYWMuY3BwOgorICAg ICAgICAoV0tQYWdlSXNVUkxLbm93bkhTVFNIb3N0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV0tCcm93 c2luZ0NvbnRleHRDb250cm9sbGVyIGJyb3dzaW5nQ29udGV4dEdyb3VwXSk6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgX3ByZWZlcmVu Y2VzRGlkQ2hhbmdlXSk6CisgICAgICAgICgtW1dLVmlldyBpbml0V2l0aEZyYW1lOmNvbnRleHRS ZWY6cGFnZUdyb3VwUmVmOnJlbGF0ZWRUb1BhZ2U6XSk6CisgICAgICAgICogVUlQcm9jZXNzL1dl YkNvbnRleHQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpXZWJDb250ZXh0KToK KyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6Y3JlYXRlV2ViUGFnZSk6CisgICAgICAgICog VUlQcm9jZXNzL1dlYkNvbnRleHQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViSW5zcGVjdG9y UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQYWdlR3JvdXBzOjppbnNw ZWN0b3JMZXZlbCk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclBhZ2VHcm91cHM6Omlz SW5zcGVjdG9yUGFnZUdyb3VwKToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yUGFnZUdy b3Vwczo6aW5zcGVjdG9yUGFnZUdyb3VwTGV2ZWwpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNw ZWN0b3JQcm94eTo6aXNJbnNwZWN0b3JQYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViSW5z cGVjdG9yUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZUdyb3VwOjpjcmVhdGVOb25OdWxsKToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUGFnZUdyb3VwLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y3JlYXRlKToKKyAgICAgICAg KFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6Om1heWJlSW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25IYW5kbGUpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnByZWZlcmVuY2VzRGlkQ2hhbmdlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6cGFnZUdyb3VwKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpjcmVhdGVXZWJQYWdlKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5Lmg6CisgICAgICAgICogVUlQcm9jZXNz L21hYy9XZWJJbnNwZWN0b3JQcm94eU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVj dG9yUHJveHk6OmNyZWF0ZUluc3BlY3RvcldpbmRvdyk6CisgICAgICAgIChXZWJLaXQ6OldlYklu c3BlY3RvclByb3h5OjpwbGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBhZ2UpOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6d2luZG93RnJhbWVEaWRDaGFuZ2UpOgorICAgICAgICAq IFVJUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc1Byb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzUHJveHk6OnBhZ2VJc1Byb2Nlc3NTdXBwcmVzc2libGUpOgorCiAyMDEzLTExLTMw ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJl dmlld2VkLCByb2xsaW5nIG91dCByMTU5ODY1LgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkNvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJDb250ZXh0LmNwcAkocmV2aXNpb24gMTU5ODkzKQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYkNvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzYsNyArMTM2LDcgQEAg V2ViQ29udGV4dDo6V2ViQ29udGV4dChjb25zdCBTdHJpbmcmIGluagogICAgICwgbV93ZWJQcm9j ZXNzQ291bnRMaW1pdChVSU5UX01BWCkKICAgICAsIG1faGF2ZUluaXRpYWxFbXB0eVByb2Nlc3Mo ZmFsc2UpCiAgICAgLCBtX3Byb2Nlc3NXaXRoUGFnZUNhY2hlKDApCi0gICAgLCBtX2RlZmF1bHRQ YWdlR3JvdXAoV2ViUGFnZUdyb3VwOjpjcmVhdGUoKSkKKyAgICAsIG1fZGVmYXVsdFBhZ2VHcm91 cChXZWJQYWdlR3JvdXA6OmNyZWF0ZU5vbk51bGwoKSkKICAgICAsIG1faW5qZWN0ZWRCdW5kbGVQ YXRoKGluamVjdGVkQnVuZGxlUGF0aCkKICAgICAsIG1fdmlzaXRlZExpbmtQcm92aWRlcih0aGlz KQogICAgICwgbV9wbHVnSW5BdXRvU3RhcnRQcm92aWRlcih0aGlzKQpAQCAtNzU2LDEwICs3NTYs NyBAQCBQYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gV2ViQ29udGV4dDo6Y3JlCiAgICAgICAgICAg ICBwcm9jZXNzID0gY3JlYXRlTmV3V2ViUHJvY2Vzc1Jlc3BlY3RpbmdQcm9jZXNzQ291bnRMaW1p dCgpOwogICAgIH0KIAotICAgIGlmICghcGFnZUdyb3VwKQotICAgICAgICBwYWdlR3JvdXAgPSBt X2RlZmF1bHRQYWdlR3JvdXAuZ2V0KCk7Ci0KLSAgICByZXR1cm4gcHJvY2Vzcy0+Y3JlYXRlV2Vi UGFnZShwYWdlQ2xpZW50LCB0aGlzLCBwYWdlR3JvdXApOworICAgIHJldHVybiBwcm9jZXNzLT5j cmVhdGVXZWJQYWdlKHBhZ2VDbGllbnQsIHBhZ2VHcm91cCA/ICpwYWdlR3JvdXAgOiBtX2RlZmF1 bHRQYWdlR3JvdXAuZ2V0KCkpOwogfQogCiBEb3dubG9hZFByb3h5KiBXZWJDb250ZXh0Ojpkb3du bG9hZChXZWJQYWdlUHJveHkqIGluaXRpYXRpbmdQYWdlLCBjb25zdCBSZXNvdXJjZVJlcXVlc3Qm IHJlcXVlc3QpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgJKHJldmlz aW9uIDE1OTg5MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgJKHdv cmtpbmcgY29weSkKQEAgLTQxOSw3ICs0MTksNyBAQCBwcml2YXRlOgogCiAgICAgV2ViUHJvY2Vz c1Byb3h5KiBtX3Byb2Nlc3NXaXRoUGFnZUNhY2hlOwogCi0gICAgUmVmUHRyPFdlYlBhZ2VHcm91 cD4gbV9kZWZhdWx0UGFnZUdyb3VwOworICAgIFJlZjxXZWJQYWdlR3JvdXA+IG1fZGVmYXVsdFBh Z2VHcm91cDsKIAogICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gbV9pbmplY3RlZEJ1bmRsZUluaXRp YWxpemF0aW9uVXNlckRhdGE7CiAgICAgU3RyaW5nIG1faW5qZWN0ZWRCdW5kbGVQYXRoOwpJbmRl eDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkluc3BlY3RvclByb3h5LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuY3BwCShy ZXZpc2lvbiAxNTk4OTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9y UHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NiwyMCArNjYsMjAgQEAgcHVibGljOgogICAg ICAgICByZXR1cm4gaW5zdGFuY2U7CiAgICAgfQogCi0gICAgdW5zaWduZWQgaW5zcGVjdG9yTGV2 ZWwoV2ViUGFnZUdyb3VwKiBpbnNwZWN0ZWRQYWdlR3JvdXApCisgICAgdW5zaWduZWQgaW5zcGVj dG9yTGV2ZWwoV2ViUGFnZUdyb3VwJiBpbnNwZWN0ZWRQYWdlR3JvdXApCiAgICAgewogICAgICAg ICByZXR1cm4gaXNJbnNwZWN0b3JQYWdlR3JvdXAoaW5zcGVjdGVkUGFnZUdyb3VwKSA/IGluc3Bl Y3RvclBhZ2VHcm91cExldmVsKGluc3BlY3RlZFBhZ2VHcm91cCkgKyAxIDogMTsKICAgICB9CiAK LSAgICBib29sIGlzSW5zcGVjdG9yUGFnZUdyb3VwKFdlYlBhZ2VHcm91cCogZ3JvdXApCisgICAg Ym9vbCBpc0luc3BlY3RvclBhZ2VHcm91cChXZWJQYWdlR3JvdXAmIGdyb3VwKQogICAgIHsKLSAg ICAgICAgcmV0dXJuIG1fcGFnZUdyb3VwTGV2ZWwuY29udGFpbnMoZ3JvdXApOworICAgICAgICBy ZXR1cm4gbV9wYWdlR3JvdXBMZXZlbC5jb250YWlucygmZ3JvdXApOwogICAgIH0KIAotICAgIHVu c2lnbmVkIGluc3BlY3RvclBhZ2VHcm91cExldmVsKFdlYlBhZ2VHcm91cCogZ3JvdXApCisgICAg dW5zaWduZWQgaW5zcGVjdG9yUGFnZUdyb3VwTGV2ZWwoV2ViUGFnZUdyb3VwJiBncm91cCkKICAg ICB7CiAgICAgICAgIEFTU0VSVChpc0luc3BlY3RvclBhZ2VHcm91cChncm91cCkpOwotICAgICAg ICByZXR1cm4gbV9wYWdlR3JvdXBMZXZlbC5nZXQoZ3JvdXApOworICAgICAgICByZXR1cm4gbV9w YWdlR3JvdXBMZXZlbC5nZXQoJmdyb3VwKTsKICAgICB9CiAKICAgICBXZWJQYWdlR3JvdXAqIGlu c3BlY3RvclBhZ2VHcm91cEZvckxldmVsKHVuc2lnbmVkIGxldmVsKQpAQCAtMzU2LDkgKzM1Niw5 IEBAIHZvaWQgV2ViSW5zcGVjdG9yUHJveHk6OnRvZ2dsZVBhZ2VQcm9maWwKICAgICBtX2lzUHJv ZmlsaW5nUGFnZSA9ICFtX2lzUHJvZmlsaW5nUGFnZTsKIH0KIAotYm9vbCBXZWJJbnNwZWN0b3JQ cm94eTo6aXNJbnNwZWN0b3JQYWdlKFdlYlBhZ2VQcm94eSogcGFnZSkKK2Jvb2wgV2ViSW5zcGVj dG9yUHJveHk6OmlzSW5zcGVjdG9yUGFnZShXZWJQYWdlUHJveHkmIHBhZ2UpCiB7Ci0gICAgcmV0 dXJuIFdlYkluc3BlY3RvclBhZ2VHcm91cHM6OnNoYXJlZCgpLmlzSW5zcGVjdG9yUGFnZUdyb3Vw KHBhZ2UtPnBhZ2VHcm91cCgpKTsKKyAgICByZXR1cm4gV2ViSW5zcGVjdG9yUGFnZUdyb3Vwczo6 c2hhcmVkKCkuaXNJbnNwZWN0b3JQYWdlR3JvdXAocGFnZS5wYWdlR3JvdXAoKSk7CiB9CiAKIHN0 YXRpYyBib29sIGlzTWFpbkluc3BlY3RvclBhZ2UoY29uc3QgV2ViSW5zcGVjdG9yUHJveHkqIHdl Ykluc3BlY3RvclByb3h5LCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdFJlZikKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJbnNwZWN0b3JQcm94eS5oCShyZXZpc2lvbiAxNTk4 OTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSW5zcGVjdG9yUHJveHkuaAkod29y a2luZyBjb3B5KQpAQCAtMTMyLDcgKzEzMiw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzUHJvZmls aW5nUGFnZSgpIGNvbnN0IHsgcmV0dXJuIG1faXNQcm9maWxpbmdQYWdlOyB9CiAgICAgdm9pZCB0 b2dnbGVQYWdlUHJvZmlsaW5nKCk7CiAKLSAgICBzdGF0aWMgYm9vbCBpc0luc3BlY3RvclBhZ2Uo V2ViUGFnZVByb3h5Kik7CisgICAgc3RhdGljIGJvb2wgaXNJbnNwZWN0b3JQYWdlKFdlYlBhZ2VQ cm94eSYpOwogCiAgICAgLy8gSW1wbGVtZW50ZWQgdGhlIHBsYXRmb3JtIFdlYkluc3BlY3RvclBy b3h5IGZpbGUKICAgICBTdHJpbmcgaW5zcGVjdG9yUGFnZVVSTCgpIGNvbnN0OwpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHAJKHJldmlzaW9uIDE1OTg5MykK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01NCw2ICs1NCwxMSBAQCBQYXNzUmVmUHRyPFdlYlBhZ2VHcm91cD4gV2ViUGFnZUdy b3VwOjpjCiAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJQYWdlR3JvdXAoaWRlbnRpZmllciwg dmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUsIHZpc2libGVUb0hpc3RvcnlDbGllbnQpKTsKIH0KIAor UGFzc1JlZjxXZWJQYWdlR3JvdXA+IFdlYlBhZ2VHcm91cDo6Y3JlYXRlTm9uTnVsbChjb25zdCBT dHJpbmcmIGlkZW50aWZpZXIsIGJvb2wgdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUsIGJvb2wgdmlz aWJsZVRvSGlzdG9yeUNsaWVudCkKK3sKKyAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBXZWJQYWdl R3JvdXAoaWRlbnRpZmllciwgdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUsIHZpc2libGVUb0hpc3Rv cnlDbGllbnQpKTsKK30KKwogV2ViUGFnZUdyb3VwKiBXZWJQYWdlR3JvdXA6OmdldCh1aW50NjRf dCBwYWdlR3JvdXBJRCkKIHsKICAgICByZXR1cm4gd2ViUGFnZUdyb3VwTWFwKCkuZ2V0KHBhZ2VH cm91cElEKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmgJKHJl dmlzaW9uIDE1OTg5MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAu aAkod29ya2luZyBjb3B5KQpAQCAtNDIsNiArNDIsNyBAQCBjbGFzcyBXZWJQYWdlR3JvdXAgOiBw dWJsaWMgQVBJOjpUeXBlZE9iCiBwdWJsaWM6CiAgICAgV2ViUGFnZUdyb3VwKGNvbnN0IFN0cmlu ZyYgaWRlbnRpZmllciA9IFN0cmluZygpLCBib29sIHZpc2libGVUb0luamVjdGVkQnVuZGxlID0g dHJ1ZSwgYm9vbCB2aXNpYmxlVG9IaXN0b3J5Q2xpZW50ID0gdHJ1ZSk7CiAgICAgc3RhdGljIFBh c3NSZWZQdHI8V2ViUGFnZUdyb3VwPiBjcmVhdGUoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyID0g U3RyaW5nKCksIGJvb2wgdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUgPSB0cnVlLCBib29sIHZpc2li bGVUb0hpc3RvcnlDbGllbnQgPSB0cnVlKTsKKyAgICBzdGF0aWMgUGFzc1JlZjxXZWJQYWdlR3Jv dXA+IGNyZWF0ZU5vbk51bGwoY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyID0gU3RyaW5nKCksIGJv b2wgdmlzaWJsZVRvSW5qZWN0ZWRCdW5kbGUgPSB0cnVlLCBib29sIHZpc2libGVUb0hpc3RvcnlD bGllbnQgPSB0cnVlKTsKICAgICBzdGF0aWMgV2ViUGFnZUdyb3VwKiBnZXQodWludDY0X3QgcGFn ZUdyb3VwSUQpOwogCiAgICAgdmlydHVhbCB+V2ViUGFnZUdyb3VwKCk7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMTU5ODkzKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTIyMiwxNiArMjIyLDE2IEBAIHN0YXRpYyBjb25zdCBjaGFyKiB3ZWJLZXlib2FyZEV2ZW50 VHlwZVMKIH0KICNlbmRpZiAvLyAhTE9HX0RJU0FCTEVECiAKLVBhc3NSZWZQdHI8V2ViUGFnZVBy b3h5PiBXZWJQYWdlUHJveHk6OmNyZWF0ZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBQYXNzUmVm UHRyPFdlYlByb2Nlc3NQcm94eT4gcHJvY2VzcywgV2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAsIHVp bnQ2NF90IHBhZ2VJRCkKK1Bhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBXZWJQYWdlUHJveHk6OmNy ZWF0ZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4g cHJvY2VzcywgV2ViUGFnZUdyb3VwJiBwYWdlR3JvdXAsIHVpbnQ2NF90IHBhZ2VJRCkKIHsKICAg ICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYlBhZ2VQcm94eShwYWdlQ2xpZW50LCBwcm9jZXNzLCBw YWdlR3JvdXAsIHBhZ2VJRCkpOwogfQogCi1XZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQYWdl Q2xpZW50JiBwYWdlQ2xpZW50LCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gcHJvY2Vzcywg V2ViUGFnZUdyb3VwKiBwYWdlR3JvdXAsIHVpbnQ2NF90IHBhZ2VJRCkKK1dlYlBhZ2VQcm94eTo6 V2ViUGFnZVByb3h5KFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFBhc3NSZWZQdHI8V2ViUHJvY2Vz c1Byb3h5PiBwcm9jZXNzLCBXZWJQYWdlR3JvdXAmIHBhZ2VHcm91cCwgdWludDY0X3QgcGFnZUlE KQogICAgIDogbV9wYWdlQ2xpZW50KHBhZ2VDbGllbnQpCiAgICAgLCBtX3Byb2Nlc3MocHJvY2Vz cykKICAgICAsIG1fcGFnZUdyb3VwKHBhZ2VHcm91cCkKLSAgICAsIG1fbWFpbkZyYW1lKDApCisg ICAgLCBtX21haW5GcmFtZShudWxscHRyKQogICAgICwgbV91c2VyQWdlbnQoc3RhbmRhcmRVc2Vy QWdlbnQoKSkKICAgICAsIG1fZ2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXIoKnRo aXMpCiAgICAgLCBtX25vdGlmaWNhdGlvblBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlcigqdGhpcykK QEAgLTU5Myw3ICs1OTMsNyBAQCBib29sIFdlYlBhZ2VQcm94eTo6bWF5YmVJbml0aWFsaXplU2Fu ZGJvCiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQogICAgIC8vIERvbid0IGdpdmUgdGhlIGluc3Bl Y3RvciBmdWxsIGFjY2VzcyB0byB0aGUgZmlsZSBzeXN0ZW0uCi0gICAgaWYgKFdlYkluc3BlY3Rv clByb3h5Ojppc0luc3BlY3RvclBhZ2UodGhpcykpCisgICAgaWYgKFdlYkluc3BlY3RvclByb3h5 Ojppc0luc3BlY3RvclBhZ2UoKnRoaXMpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYK IApAQCAtMjAxNyw3ICsyMDE3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnByZWZlcmVuY2VzRGlk Q2hhbmdlKAogICAgIC8vIGV2ZW4gaWYgbm90aGluZyBjaGFuZ2VkIGluIFVJIHByb2Nlc3MsIHNv IHRoYXQgb3ZlcnJpZGVzIGdldCByZW1vdmVkLgogCiAgICAgLy8gUHJlZmVyZW5jZXMgbmVlZCB0 byBiZSB1cGRhdGVkIGR1cmluZyBzeW5jaHJvbm91cyBwcmludGluZyB0byBtYWtlICJwcmludCBi YWNrZ3JvdW5kcyIgcHJlZmVyZW5jZSB3b3JrIHdoZW4gdG9nZ2xlZCBmcm9tIGEgcHJpbnQgZGlh bG9nIGNoZWNrYm94LgotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UHJl ZmVyZW5jZXNEaWRDaGFuZ2UocGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCktPnN0b3JlKCkpLCBt X3BhZ2VJRCwgbV9pc1BlcmZvcm1pbmdET01QcmludE9wZXJhdGlvbiA/IENvcmVJUEM6OkRpc3Bh dGNoTWVzc2FnZUV2ZW5XaGVuV2FpdGluZ0ZvclN5bmNSZXBseSA6IDApOworICAgIG1fcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UHJlZmVyZW5jZXNEaWRDaGFuZ2UocGFnZUdyb3Vw KCkucHJlZmVyZW5jZXMoKS0+c3RvcmUoKSksIG1fcGFnZUlELCBtX2lzUGVyZm9ybWluZ0RPTVBy aW50T3BlcmF0aW9uID8gQ29yZUlQQzo6RGlzcGF0Y2hNZXNzYWdlRXZlbldoZW5XYWl0aW5nRm9y U3luY1JlcGx5IDogMCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDcmVhdGVNYWluRnJh bWUodWludDY0X3QgZnJhbWVJRCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgJKHJldmlzaW9uIDE1OTg5MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMzIyLDcgKzMyMiw3IEBAIGNsYXNzIFdl YlBhZ2VQcm94eQogICAgICwgcHVibGljIENvcmVJUEM6Ok1lc3NhZ2VSZWNlaXZlciB7CiBwdWJs aWM6CiAKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxXZWJQYWdlUHJveHk+IGNyZWF0ZShQYWdlQ2xp ZW50JiwgUGFzc1JlZlB0cjxXZWJQcm9jZXNzUHJveHk+LCBXZWJQYWdlR3JvdXAqLCB1aW50NjRf dCBwYWdlSUQpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gY3JlYXRlKFBh Z2VDbGllbnQmLCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4sIFdlYlBhZ2VHcm91cCYsIHVp bnQ2NF90IHBhZ2VJRCk7CiAgICAgdmlydHVhbCB+V2ViUGFnZVByb3h5KCk7CiAKICAgICB1aW50 NjRfdCBwYWdlSUQoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VJRDsgfQpAQCAtNzAwLDcgKzcwMCw3 IEBAIHB1YmxpYzoKICAgICBXZWJQcm9jZXNzUHJveHkqIHByb2Nlc3MoKSBjb25zdDsKICAgICBQ bGF0Zm9ybVByb2Nlc3NJZGVudGlmaWVyIHByb2Nlc3NJZGVudGlmaWVyKCkgY29uc3Q7CiAKLSAg ICBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZUdyb3VwLmdl dCgpOyB9CisgICAgV2ViUGFnZUdyb3VwJiBwYWdlR3JvdXAoKSB7IHJldHVybiBtX3BhZ2VHcm91 cC5nZXQoKTsgfQogCiAgICAgYm9vbCBpc1ZhbGlkKCkgY29uc3Q7CiAKQEAgLTg0Nyw3ICs4NDcs NyBAQCBwdWJsaWM6CiAgICAgV2ViQ29yZTo6U2Nyb2xsUGlubmluZ0JlaGF2aW9yIHNjcm9sbFBp bm5pbmdCZWhhdmlvcigpIHsgcmV0dXJuIG1fc2Nyb2xsUGlubmluZ0JlaGF2aW9yOyB9CiAgICAg ICAgIAogcHJpdmF0ZToKLSAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYsIFBhc3NSZWZQdHI8 V2ViUHJvY2Vzc1Byb3h5PiwgV2ViUGFnZUdyb3VwKiwgdWludDY0X3QgcGFnZUlEKTsKKyAgICBX ZWJQYWdlUHJveHkoUGFnZUNsaWVudCYsIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiwgV2Vi UGFnZUdyb3VwJiwgdWludDY0X3QgcGFnZUlEKTsKICAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6 ZSgpOwogICAgIHZvaWQgaW5pdGlhbGl6ZUNyZWF0aW9uUGFyYW1ldGVycygpOwogCkBAIC0xMTU0 LDcgKzExNTQsNyBAQCBwcml2YXRlOgogCiAgICAgc3RkOjp1bmlxdWVfcHRyPERyYXdpbmdBcmVh UHJveHk+IG1fZHJhd2luZ0FyZWE7CiAgICAgUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gbV9wcm9j ZXNzOwotICAgIFJlZlB0cjxXZWJQYWdlR3JvdXA+IG1fcGFnZUdyb3VwOworICAgIFJlZjxXZWJQ YWdlR3JvdXA+IG1fcGFnZUdyb3VwOwogICAgIFJlZlB0cjxXZWJGcmFtZVByb3h5PiBtX21haW5G cmFtZTsKICAgICBSZWZQdHI8V2ViRnJhbWVQcm94eT4gbV9mb2N1c2VkRnJhbWU7CiAgICAgUmVm UHRyPFdlYkZyYW1lUHJveHk+IG1fZnJhbWVTZXRMYXJnZXN0RnJhbWU7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAkocmV2aXNpb24gMTU5ODkz KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTE2MCw3ICsxNjAsNyBAQCBXZWJQYWdlUHJveHkqIFdlYlByb2Nlc3NQcm94 eTo6d2ViUGFnZSh1CiAgICAgcmV0dXJuIGdsb2JhbFBhZ2VNYXAoKS5nZXQocGFnZUlEKTsKIH0K IAotUGFzc1JlZlB0cjxXZWJQYWdlUHJveHk+IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRlV2ViUGFn ZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBXZWJDb250ZXh0KiwgV2ViUGFnZUdyb3VwKiBwYWdl R3JvdXApCitQYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gV2ViUHJvY2Vzc1Byb3h5OjpjcmVhdGVX ZWJQYWdlKFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFdlYlBhZ2VHcm91cCYgcGFnZUdyb3VwKQog ewogICAgIHVpbnQ2NF90IHBhZ2VJRCA9IGdlbmVyYXRlUGFnZUlEKCk7CiAgICAgUmVmUHRyPFdl YlBhZ2VQcm94eT4gd2ViUGFnZSA9IFdlYlBhZ2VQcm94eTo6Y3JlYXRlKHBhZ2VDbGllbnQsIHRo aXMsIHBhZ2VHcm91cCwgcGFnZUlEKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmgJKHJldmlzaW9uIDE1OTg5MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNzcsNyArNzcsNyBA QCBwdWJsaWM6CiAgICAgV2ViQ29udGV4dCogY29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1fY29u dGV4dC5nZXQoKTsgfQogCiAgICAgc3RhdGljIFdlYlBhZ2VQcm94eSogd2ViUGFnZSh1aW50NjRf dCBwYWdlSUQpOwotICAgIFBhc3NSZWZQdHI8V2ViUGFnZVByb3h5PiBjcmVhdGVXZWJQYWdlKFBh Z2VDbGllbnQmLCBXZWJDb250ZXh0KiwgV2ViUGFnZUdyb3VwKik7CisgICAgUGFzc1JlZlB0cjxX ZWJQYWdlUHJveHk+IGNyZWF0ZVdlYlBhZ2UoUGFnZUNsaWVudCYsIFdlYlBhZ2VHcm91cCYpOwog ICAgIHZvaWQgYWRkRXhpc3RpbmdXZWJQYWdlKFdlYlBhZ2VQcm94eSosIHVpbnQ2NF90IHBhZ2VJ RCk7CiAgICAgdm9pZCByZW1vdmVXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCk7CiAgICAgVmVjdG9y PFdlYlBhZ2VQcm94eSo+IHBhZ2VzKCkgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkocmV2aXNpb24gMTU5ODkzKQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYwLDcgKzYw LDcgQEAgV0tDb250ZXh0UmVmIFdLUGFnZUdldENvbnRleHQoV0tQYWdlUmVmIAogCiBXS1BhZ2VH cm91cFJlZiBXS1BhZ2VHZXRQYWdlR3JvdXAoV0tQYWdlUmVmIHBhZ2VSZWYpCiB7Ci0gICAgcmV0 dXJuIHRvQVBJKHRvSW1wbChwYWdlUmVmKS0+cGFnZUdyb3VwKCkpOworICAgIHJldHVybiB0b0FQ SSgmdG9JbXBsKHBhZ2VSZWYpLT5wYWdlR3JvdXAoKSk7CiB9CiAKIHZvaWQgV0tQYWdlTG9hZFVS TChXS1BhZ2VSZWYgcGFnZVJlZiwgV0tVUkxSZWYgVVJMUmVmKQpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL21hYy9XS1BhZ2VQcml2YXRlTWFjLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvbWFjL1dLUGFnZVByaXZhdGVNYWMuY3Bw CShyZXZpc2lvbiAxNTk4OTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvbWFj L1dLUGFnZVByaXZhdGVNYWMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw3IEBAIHBp ZF90IFdLUGFnZUdldFByb2Nlc3NJZGVudGlmaWVyKFdLUGFnZVIKIGJvb2wgV0tQYWdlSXNVUkxL bm93bkhTVFNIb3N0KFdLUGFnZVJlZiBwYWdlLCBXS1VSTFJlZiB1cmwpCiB7CiAgICAgV2ViUGFn ZVByb3h5KiB3ZWJQYWdlUHJveHkgPSB0b0ltcGwocGFnZSk7Ci0gICAgYm9vbCBwcml2YXRlQnJv d3NpbmdFbmFibGVkID0gd2ViUGFnZVByb3h5LT5wYWdlR3JvdXAoKS0+cHJlZmVyZW5jZXMoKS0+ cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpOworICAgIGJvb2wgcHJpdmF0ZUJyb3dzaW5nRW5hYmxl ZCA9IHdlYlBhZ2VQcm94eS0+cGFnZUdyb3VwKCkucHJlZmVyZW5jZXMoKS0+cHJpdmF0ZUJyb3dz aW5nRW5hYmxlZCgpOwogCiAgICAgcmV0dXJuIHdlYlBhZ2VQcm94eS0+cHJvY2VzcygpLT5jb250 ZXh0KCktPmlzVVJMS25vd25IU1RTSG9zdCh0b0ltcGwodXJsKS0+c3RyaW5nKCksIHByaXZhdGVC cm93c2luZ0VuYWJsZWQpOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIu bW0JKHJldmlzaW9uIDE1OTg5MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29j b2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xNDAs MTAgKzE0MCw3IEBAIC0gKFdLUHJvY2Vzc0dyb3VwICopcHJvY2Vzc0dyb3VwCiAKIC0gKFdLQnJv d3NpbmdDb250ZXh0R3JvdXAgKilicm93c2luZ0NvbnRleHRHcm91cAogewotICAgIFdlYlBhZ2VH cm91cCogcGFnZUdyb3VwID0gX3BhZ2UtPnBhZ2VHcm91cCgpOwotICAgIGlmICghcGFnZUdyb3Vw KQotICAgICAgICByZXR1cm4gbmlsOwotICAgIHJldHVybiB3cmFwcGVyKCpwYWdlR3JvdXApOwor ICAgIHJldHVybiB3cmFwcGVyKF9wYWdlLT5wYWdlR3JvdXAoKSk7CiB9CiAKIC0gKFdLUGFnZVJl ZilfcGFnZVJlZgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmll dy5tbQkocmV2aXNpb24gMTU5ODkzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9t YWMvV0tWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMjcyLDcgKzIyNzIsNyBAQCAtICh2b2lk KV9kaWRSZWxhdW5jaFByb2Nlc3MKIAogLSAodm9pZClfcHJlZmVyZW5jZXNEaWRDaGFuZ2UKIHsK LSAgICBCT09MIG5lZWRzVmlld0ZyYW1lSW5XaW5kb3dDb29yZGluYXRlcyA9IF9kYXRhLT5fcGFn ZS0+cGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCktPnBsdWdpbnNFbmFibGVkKCk7CisgICAgQk9P TCBuZWVkc1ZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMgPSBfZGF0YS0+X3BhZ2UtPnBhZ2VH cm91cCgpLnByZWZlcmVuY2VzKCktPnBsdWdpbnNFbmFibGVkKCk7CiAKICAgICBpZiAoISFuZWVk c1ZpZXdGcmFtZUluV2luZG93Q29vcmRpbmF0ZXMgPT0gISFfZGF0YS0+X25lZWRzVmlld0ZyYW1l SW5XaW5kb3dDb29yZGluYXRlcykKICAgICAgICAgcmV0dXJuOwpAQCAtMjkyMiw3ICsyOTIyLDcg QEAgLSAoaWQpaW5pdFdpdGhGcmFtZTooTlNSZWN0KWZyYW1lIGNvbnRleAogCiAgICAgX2RhdGEt Pl9pbnRyaW5zaWNDb250ZW50U2l6ZSA9IE5TTWFrZVNpemUoTlNWaWV3Tm9JbnN0cmluc2ljTWV0 cmljLCBOU1ZpZXdOb0luc3RyaW5zaWNNZXRyaWMpOwogCi0gICAgX2RhdGEtPl9uZWVkc1ZpZXdG cmFtZUluV2luZG93Q29vcmRpbmF0ZXMgPSBfZGF0YS0+X3BhZ2UtPnBhZ2VHcm91cCgpLT5wcmVm ZXJlbmNlcygpLT5wbHVnaW5zRW5hYmxlZCgpOworICAgIF9kYXRhLT5fbmVlZHNWaWV3RnJhbWVJ bldpbmRvd0Nvb3JkaW5hdGVzID0gX2RhdGEtPl9wYWdlLT5wYWdlR3JvdXAoKS5wcmVmZXJlbmNl cygpLT5wbHVnaW5zRW5hYmxlZCgpOwogICAgIF9kYXRhLT5fZnJhbWVPcmlnaW4gPSBOU1plcm9Q b2ludDsKICAgICBfZGF0YS0+X2NvbnRlbnRBbmNob3IgPSBXS0NvbnRlbnRBbmNob3JUb3BMZWZ0 OwogICAgIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJJbnNwZWN0b3JQ cm94eU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dl Ykluc3BlY3RvclByb3h5TWFjLm1tCShyZXZpc2lvbiAxNTk4OTMpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1dlYkluc3BlY3RvclByb3h5TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBA IC0yODUsNyArMjg1LDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6Y3JlYXRlSW5zcGVjdG9y VwogICAgIE5TUmVjdCB3aW5kb3dGcmFtZSA9IE5TTWFrZVJlY3QoMCwgMCwgaW5pdGlhbFdpbmRv d1dpZHRoLCBpbml0aWFsV2luZG93SGVpZ2h0KTsKIAogICAgIC8vIFJlc3RvcmUgdGhlIHNhdmVk IHdpbmRvdyBmcmFtZSwgaWYgdGhlcmUgd2FzIG9uZS4KLSAgICBOU1N0cmluZyAqc2F2ZWRXaW5k b3dGcmFtZVN0cmluZyA9IHBhZ2UoKS0+cGFnZUdyb3VwKCktPnByZWZlcmVuY2VzKCktPmluc3Bl Y3RvcldpbmRvd0ZyYW1lKCk7CisgICAgTlNTdHJpbmcgKnNhdmVkV2luZG93RnJhbWVTdHJpbmcg PSBwYWdlKCktPnBhZ2VHcm91cCgpLnByZWZlcmVuY2VzKCktPmluc3BlY3RvcldpbmRvd0ZyYW1l KCk7CiAgICAgTlNSZWN0IHNhdmVkV2luZG93RnJhbWUgPSBOU1JlY3RGcm9tU3RyaW5nKHNhdmVk V2luZG93RnJhbWVTdHJpbmcpOwogICAgIGlmICghTlNJc0VtcHR5UmVjdChzYXZlZFdpbmRvd0Zy YW1lKSkKICAgICAgICAgd2luZG93RnJhbWUgPSBzYXZlZFdpbmRvd0ZyYW1lOwpAQCAtMzg0LDcg KzM4NCw3IEBAIFdlYlBhZ2VQcm94eSogV2ViSW5zcGVjdG9yUHJveHk6OnBsYXRmb3IKICAgICB9 IGVsc2UgewogICAgICAgICBpbml0aWFsUmVjdCA9IE5TTWFrZVJlY3QoMCwgMCwgaW5pdGlhbFdp bmRvd1dpZHRoLCBpbml0aWFsV2luZG93SGVpZ2h0KTsKIAotICAgICAgICBOU1N0cmluZyAqd2lu ZG93RnJhbWVTdHJpbmcgPSBwYWdlKCktPnBhZ2VHcm91cCgpLT5wcmVmZXJlbmNlcygpLT5pbnNw ZWN0b3JXaW5kb3dGcmFtZSgpOworICAgICAgICBOU1N0cmluZyAqd2luZG93RnJhbWVTdHJpbmcg PSBwYWdlKCktPnBhZ2VHcm91cCgpLnByZWZlcmVuY2VzKCktPmluc3BlY3RvcldpbmRvd0ZyYW1l KCk7CiAgICAgICAgIE5TUmVjdCB3aW5kb3dGcmFtZSA9IE5TUmVjdEZyb21TdHJpbmcod2luZG93 RnJhbWVTdHJpbmcpOwogICAgICAgICBpZiAoIU5TSXNFbXB0eVJlY3Qod2luZG93RnJhbWUpKQog ICAgICAgICAgICAgaW5pdGlhbFJlY3QgPSBbTlNXaW5kb3cgY29udGVudFJlY3RGb3JGcmFtZVJl Y3Q6d2luZG93RnJhbWUgc3R5bGVNYXNrOndpbmRvd1N0eWxlTWFza107CkBAIC02MDcsNyArNjA3 LDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6d2luZG93RnJhbWVEaWRDaAogICAgICAgICBy ZXR1cm47CiAKICAgICBOU1N0cmluZyAqZnJhbWVTdHJpbmcgPSBOU1N0cmluZ0Zyb21SZWN0KFtt X2luc3BlY3RvcldpbmRvdyBmcmFtZV0pOwotICAgIHBhZ2UoKS0+cGFnZUdyb3VwKCktPnByZWZl cmVuY2VzKCktPnNldEluc3BlY3RvcldpbmRvd0ZyYW1lKGZyYW1lU3RyaW5nKTsKKyAgICBwYWdl KCktPnBhZ2VHcm91cCgpLnByZWZlcmVuY2VzKCktPnNldEluc3BlY3RvcldpbmRvd0ZyYW1lKGZy YW1lU3RyaW5nKTsKIH0KIAogdm9pZCBXZWJJbnNwZWN0b3JQcm94eTo6aW5zcGVjdGVkVmlld0Zy YW1lRGlkQ2hhbmdlKENHRmxvYXQgY3VycmVudERpbWVuc2lvbikKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc1Byb3h5TWFjLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc1Byb3h5TWFjLm1tCShyZXZpc2lv biAxNTk4OTMpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlByb2Nlc3NQcm94 eU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjEsNyArNjEsNyBAQCB2b2lkIFdlYlByb2Nlc3NQ cm94eTo6cGxhdGZvcm1HZXRMYXVuY2hPCiAKIGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpwYWdlSXNQ cm9jZXNzU3VwcHJlc3NpYmxlKFdlYlBhZ2VQcm94eSogcGFnZSkKIHsKLSAgICByZXR1cm4gIXBh Z2UtPmlzVmlld1Zpc2libGUoKSAmJiBwYWdlLT5wYWdlR3JvdXAoKS0+cHJlZmVyZW5jZXMoKS0+ cGFnZVZpc2liaWxpdHlCYXNlZFByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQoKTsKKyAgICByZXR1 cm4gIXBhZ2UtPmlzVmlld1Zpc2libGUoKSAmJiBwYWdlLT5wYWdlR3JvdXAoKS5wcmVmZXJlbmNl cygpLT5wYWdlVmlzaWJpbGl0eUJhc2VkUHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCgpOwogfQog CiBib29sIFdlYlByb2Nlc3NQcm94eTo6YWxsUGFnZXNBcmVQcm9jZXNzU3VwcHJlc3NpYmxlKCkg Y29uc3QK