118675 2013-07-15 08:40:32 -0700 [ATK] Leak: Leaks in testatk.c 2013-09-02 07:39:56 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 116317 0 brian.holt brian.holt cdumez cfleizach cgarcia commit-queue ocdude oldest_to_newest 908416 0 brian.holt 2013-07-15 08:40:32 -0700 Fix leaks in the testatk.c unit test. 908428 1 206668 brian.holt 2013-07-15 09:27:01 -0700 Created attachment 206668 Patch 908433 2 206668 mario 2013-07-15 09:39:05 -0700 Comment on attachment 206668 Patch Thanks for the patch (and the general cleanup). Assuming you are not double-unreffing/freeing anything (which I think you are not), the patch looks good to me 908997 3 brian.holt 2013-07-16 13:22:08 -0700 (In reply to comment #2) > (From update of attachment 206668 [details]) > Thanks for the patch (and the general cleanup). Assuming you are not double-unreffing/freeing anything (which I think you are not), the patch looks good to me Having gone over the patch quite thoroughly I am satisfied that there is no double free'ing and that the logic isn't changed. 923636 4 210273 brian.holt 2013-09-02 02:44:18 -0700 Created attachment 210273 Rebased to master 923693 5 210273 mario 2013-09-02 07:16:46 -0700 Comment on attachment 210273 Rebased to master Thanks for rebasing the patch. It still looks good to me now and, on top of that, it also seems like a good one to give my first r+ to as a newborn reviewer ;) PS: I'm also setting the cq+. Hope you don't mind me doing it. 923700 6 210273 commit-queue 2013-09-02 07:39:53 -0700 Comment on attachment 210273 Rebased to master Clearing flags on attachment: 210273 Committed r154953: <http://trac.webkit.org/changeset/154953> 923701 7 commit-queue 2013-09-02 07:39:56 -0700 All reviewed patches have been landed. Closing bug. 206668 2013-07-15 09:27:01 -0700 2013-09-02 02:44:08 -0700 Patch bug-118675-20130715172624.patch text/plain 9687 brian.holt U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyNjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggY2E2YTQ1ZjJi N2UzYzY3ZWE2MGE0Yzk3NWQ5YzIwYTM3NDNkNTJkMy4uNTczMWQ5M2M0YWZjOWY3MjI4ZGJiZGUy ODBiMWRiYWVlNmY1Zjk4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEz LTA3LTE1ICBCcmlhbiBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKworICAgICAgICBb QVRLXSBMZWFrOiBMZWFrcyBpbiB0ZXN0YXRrLmMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExODY3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIG1lbW9yeSBsZWFrcy4KKworICAgICAgICAqIHRl c3RzL3Rlc3RhdGsuYzoKKyAgICAgICAgKHRlc3RXZWJraXRBdGtDYXJldE9mZnNldHMpOgorICAg ICAgICAodGVzdFdlYmtpdEF0a0NhcmV0T2Zmc2V0c0FuZEV4dHJhbm91c1doaXRlU3BhY2VzKToK KyAgICAgICAgKHRlc3RXZWJraXRBdGtHZXRUZXh0QXRPZmZzZXQpOgorICAgICAgICAodGVzdFdl YmtpdEF0a0dldFRleHRBdE9mZnNldFRleHRhcmVhKToKKyAgICAgICAgKHRlc3RXZWJraXRBdGtH ZXRUZXh0QXRPZmZzZXRUZXh0SW5wdXQpOgorICAgICAgICAodGVzdFdlYmtpdEF0a0dldFRleHRJ blBhcmFncmFwaEFuZEJvZHlTaW1wbGUpOgorICAgICAgICAodGVzdFdlYmtpdEF0a0dldFRleHRJ blBhcmFncmFwaEFuZEJvZHlNb2RlcmF0ZSk6CisgICAgICAgICh0ZXN0V2Via2l0QXRrVGV4dEF0 dHJpYnV0ZXMpOgorICAgICAgICAodGVzdFdlYmtpdEF0a1RleHRTZWxlY3Rpb25zKToKKyAgICAg ICAgKHRlc3RXZWJraXRBdGtMaXN0c09mSXRlbXMpOgorCiAyMDEzLTA3LTA5ICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBV cGRhdGUgTkVXUyBhbmQgVmVyc2lvbnMubTQgZm9yIDIuMS4zIHJlbGVhc2UuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMgYi9Tb3VyY2UvV2ViS2l0L2d0ay90 ZXN0cy90ZXN0YXRrLmMKaW5kZXggMjQyZjFkNzhhN2Q1NDUxMDZhODUyOTBiMTNiYzFlN2JmNzUz NGJjMy4uMjg2MzU2MTMwYmU3ZWUxNTc4NjYwYjE3Y2NmM2YyZmQ3N2Q1NzVjZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGF0ay5jCisrKyBiL1NvdXJjZS9XZWJLaXQv Z3RrL3Rlc3RzL3Rlc3RhdGsuYwpAQCAtMzQ0LDEyICszNDQsMTQgQEAgc3RhdGljIHZvaWQgdGVz dFdlYmtpdEF0a0NhcmV0T2Zmc2V0cygpCiAgICAgdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0KEFU S19URVhUKGxpc3RJdGVtKSwgMCwgLTEpOwogICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXh0LCA9PSwg IjEuIEEgbGlzdCBpdGVtIik7CiAgICAgZ19mcmVlICh0ZXh0KTsKKyAgICBnX29iamVjdF91bnJl ZihsaXN0SXRlbSk7CiAKICAgICBsaXN0SXRlbSA9IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVf Y2hpbGQobGlzdCwgMSk7CiAgICAgZ19hc3NlcnQoQVRLX0lTX1RFWFQobGlzdEl0ZW0pKTsKICAg ICB0ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQoQVRLX1RFWFQobGlzdEl0ZW0pLCAwLCAtMSk7CiAg ICAgZ19hc3NlcnRfY21wc3RyKHRleHQsID09LCAiMi4gQmxvY2sgc3BhbiBpbiBhIGxpc3QgaXRl bVxuSW5saW5lIHNwYW4gaW4gYSBsaXN0IGl0ZW0iKTsKICAgICBnX2ZyZWUgKHRleHQpOworICAg IGdfb2JqZWN0X3VucmVmKGxpc3RJdGVtKTsKIAogICAgIGxpc3RJdGVtID0gYXRrX29iamVjdF9y ZWZfYWNjZXNzaWJsZV9jaGlsZChsaXN0LCAyKTsKICAgICBnX2Fzc2VydChBVEtfSVNfVEVYVChs aXN0SXRlbSkpOwpAQCAtNDIzLDYgKzQyNSw3IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJraXRBdGtD YXJldE9mZnNldHMoKQogICAgIGdfYXNzZXJ0X2NtcGludChyZXN1bHQsID09LCBUUlVFKTsKICAg ICBvZmZzZXQgPSBhdGtfdGV4dF9nZXRfY2FyZXRfb2Zmc2V0KEFUS19URVhUKHRhYmxlQ2VsbCkp OwogICAgIGdfYXNzZXJ0X2NtcGludChvZmZzZXQsID09LCAyKTsKKyAgICBnX29iamVjdF91bnJl Zih0YWJsZUNlbGwpOwogCiAgICAgLyogRXZlbiBlbXB0eSB0YWJsZSBjZWxscyBzaG91bGQgaW1w bGVtZW50IEF0a1RleHQsIGJ1dCByZXBvcnQgYW4gZW1wdHkgc3RyaW5nICovCiAgICAgdGFibGVD ZWxsID0gYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZCh0YWJsZSwgMSk7CkBAIC00MzEs NiArNDM0LDcgQEAgc3RhdGljIHZvaWQgdGVzdFdlYmtpdEF0a0NhcmV0T2Zmc2V0cygpCiAgICAg dGV4dCA9IGF0a190ZXh0X2dldF90ZXh0KEFUS19URVhUKHRhYmxlQ2VsbCksIDAsIC0xKTsKICAg ICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICIiKTsKICAgICBnX2ZyZWUodGV4dCk7CisgICAg Z19vYmplY3RfdW5yZWYodGFibGVDZWxsKTsKIAogICAgIHRhYmxlQ2VsbCA9IGF0a19vYmplY3Rf cmVmX2FjY2Vzc2libGVfY2hpbGQodGFibGUsIDIpOwogICAgIGdfYXNzZXJ0KEFUS19JU19URVhU KHRhYmxlQ2VsbCkpOwpAQCAtNDM4LDYgKzQ0Miw3IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJraXRB dGtDYXJldE9mZnNldHMoKQogICAgIHRleHQgPSBhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVYVCh0 YWJsZUNlbGwpLCAwLCAtMSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKHRleHQsID09LCAiQmxvY2sg c3BhbiBpbiBhIGxpbmsgaW4gYSB0YWJsZSBjZWxsXG5JbmxpbmUgc3BhbiBpbiBhIGxpbmsgaW4g YSB0YWJsZSBjZWxsIik7CiAgICAgZ19mcmVlKHRleHQpOworICAgIGdfb2JqZWN0X3VucmVmKHRh YmxlQ2VsbCk7CiAKICAgICB0YWJsZUNlbGwgPSBhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxlX2No aWxkKHRhYmxlLCAzKTsKICAgICBnX2Fzc2VydChBVEtfSVNfVEVYVCh0YWJsZUNlbGwpKTsKQEAg LTQ1Miw2ICs0NTcsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Via2l0QXRrQ2FyZXRPZmZzZXRzKCkK ICAgICB0ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQoQVRLX1RFWFQoaGVhZGVyKSwgMCwgLTEpOwog ICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXh0LCA9PSwgIkJsb2NrIHNwYW4gaW4gYSBsaW5rIGluIGEg aGVhZGluZ1xuSW5saW5lIHNwYW4gaW4gYSBsaW5rIGluIGEgaGVhZGluZyIpOwogICAgIGdfZnJl ZSh0ZXh0KTsKKyAgICBnX29iamVjdF91bnJlZihoZWFkZXIpOwogCiAgICAgaGVhZGVyID0gYXRr X29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChvYmplY3QsIDYpOwogICAgIGdfYXNzZXJ0KEFU S19JU19URVhUKGhlYWRlcikpOwpAQCAtNTE4LDYgKzUyNCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RX ZWJraXRBdGtDYXJldE9mZnNldHNBbmRFeHRyYW5vdXNXaGl0ZVNwYWNlcygpCiAgICAgY2FyZXRP ZmZzZXQgPSBhdGtfdGV4dF9nZXRfY2FyZXRfb2Zmc2V0KHRleHRPYmplY3QpOwogICAgIGdfYXNz ZXJ0X2NtcGludChjYXJldE9mZnNldCwgPT0sIGNoYXJhY3RlckNvdW50KTsKIAorICAgIGdfb2Jq ZWN0X3VucmVmKG9iamVjdCk7CiAgICAgZ19vYmplY3RfdW5yZWYod2ViVmlldyk7CiB9CiAKQEAg LTc3NSw2ICs3ODIsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Via2l0QXRrR2V0VGV4dEF0T2Zmc2V0 KCkKIAogICAgIHJ1bkdldFRleHRUZXN0cyh0ZXh0T2JqZWN0KTsKIAorICAgIGdfb2JqZWN0X3Vu cmVmKG9iamVjdCk7CiAgICAgZ19vYmplY3RfdW5yZWYod2ViVmlldyk7CiB9CiAKQEAgLTgxMSwx NiArODE5LDE4IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJraXRBdGtHZXRUZXh0QXRPZmZzZXRUZXh0 YXJlYSgpCiAgICAgLyogR2V0IHRvIHRoZSBpbm5lciBBdGtUZXh0IG9iamVjdC4gKi8KICAgICBB dGtPYmplY3QqIG9iamVjdCA9IGdldFdlYkFyZWFPYmplY3Qod2ViVmlldyk7CiAgICAgZ19hc3Nl cnQob2JqZWN0KTsKLSAgICBvYmplY3QgPSBhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxlX2NoaWxk KG9iamVjdCwgMCk7Ci0gICAgZ19hc3NlcnQob2JqZWN0KTsKLSAgICBvYmplY3QgPSBhdGtfb2Jq ZWN0X3JlZl9hY2Nlc3NpYmxlX2NoaWxkKG9iamVjdCwgMCk7Ci0gICAgZ19hc3NlcnQob2JqZWN0 KTsKKyAgICBBdGtPYmplY3QqIGNoaWxkID0gYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGls ZChvYmplY3QsIDApOworICAgIGdfYXNzZXJ0KGNoaWxkKTsKKyAgICBBdGtPYmplY3QqIGdyYW5k Y2hpbGQgPSBhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxlX2NoaWxkKGNoaWxkLCAwKTsKKyAgICBn X2Fzc2VydChncmFuZGNoaWxkKTsKIAotICAgIEF0a1RleHQqIHRleHRPYmplY3QgPSBBVEtfVEVY VChvYmplY3QpOworICAgIEF0a1RleHQqIHRleHRPYmplY3QgPSBBVEtfVEVYVChncmFuZGNoaWxk KTsKICAgICBnX2Fzc2VydChBVEtfSVNfVEVYVCh0ZXh0T2JqZWN0KSk7CiAKICAgICBydW5HZXRU ZXh0VGVzdHModGV4dE9iamVjdCk7CiAKKyAgICBnX29iamVjdF91bnJlZihjaGlsZCk7CisgICAg Z19vYmplY3RfdW5yZWYoZ3JhbmRjaGlsZCk7CiAgICAgZ19vYmplY3RfdW5yZWYod2ViVmlldyk7 CiB9CiAKQEAgLTgzNSwxNiArODQ1LDE4IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJraXRBdGtHZXRU ZXh0QXRPZmZzZXRUZXh0SW5wdXQoKQogICAgIC8qIEdldCB0byB0aGUgaW5uZXIgQXRrVGV4dCBv YmplY3QuICovCiAgICAgQXRrT2JqZWN0KiBvYmplY3QgPSBnZXRXZWJBcmVhT2JqZWN0KHdlYlZp ZXcpOwogICAgIGdfYXNzZXJ0KG9iamVjdCk7Ci0gICAgb2JqZWN0ID0gYXRrX29iamVjdF9yZWZf YWNjZXNzaWJsZV9jaGlsZChvYmplY3QsIDApOwotICAgIGdfYXNzZXJ0KG9iamVjdCk7Ci0gICAg b2JqZWN0ID0gYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChvYmplY3QsIDApOwotICAg IGdfYXNzZXJ0KG9iamVjdCk7CisgICAgQXRrT2JqZWN0KiBjaGlsZCA9IGF0a19vYmplY3RfcmVm X2FjY2Vzc2libGVfY2hpbGQob2JqZWN0LCAwKTsKKyAgICBnX2Fzc2VydChjaGlsZCk7CisgICAg QXRrT2JqZWN0KiBncmFuZGNoaWxkID0gYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChj aGlsZCwgMCk7CisgICAgZ19hc3NlcnQoZ3JhbmRjaGlsZCk7CiAKLSAgICBBdGtUZXh0KiB0ZXh0 T2JqZWN0ID0gQVRLX1RFWFQob2JqZWN0KTsKKyAgICBBdGtUZXh0KiB0ZXh0T2JqZWN0ID0gQVRL X1RFWFQoZ3JhbmRjaGlsZCk7CiAgICAgZ19hc3NlcnQoQVRLX0lTX1RFWFQodGV4dE9iamVjdCkp OwogCiAgICAgcnVuR2V0VGV4dFRlc3RzKHRleHRPYmplY3QpOwogCisgICAgZ19vYmplY3RfdW5y ZWYoY2hpbGQpOworICAgIGdfb2JqZWN0X3VucmVmKGdyYW5kY2hpbGQpOwogICAgIGdfb2JqZWN0 X3VucmVmKHdlYlZpZXcpOwogfQogCkBAIC0xMDUwLDkgKzEwNjIsMTEgQEAgc3RhdGljIHZvaWQg dGVzdFdlYmtpdEF0a0dldFRleHRJblBhcmFncmFwaEFuZEJvZHlTaW1wbGUoKQogCiAgICAgY2hh ciAqdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0KHRleHRPYmplY3QxLCAwLCAtMSk7CiAgICAgZ19h c3NlcnRfY21wc3RyKHRleHQsID09LCAiVGhpcyBpcyBhIHRlc3QuIik7CisgICAgZ19mcmVlKHRl eHQpOwogCiAgICAgdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0KHRleHRPYmplY3QyLCAwLCAxMik7 CiAgICAgZ19hc3NlcnRfY21wc3RyKHRleHQsID09LCAiSGVsbG8gd29ybGQuIik7CisgICAgZ19m cmVlKHRleHQpOwogCiAgICAgZ19vYmplY3RfdW5yZWYob2JqZWN0MSk7CiAgICAgZ19vYmplY3Rf dW5yZWYob2JqZWN0Mik7CkBAIC0xMDgyLDkgKzEwOTYsMTEgQEAgc3RhdGljIHZvaWQgdGVzdFdl YmtpdEF0a0dldFRleHRJblBhcmFncmFwaEFuZEJvZHlNb2RlcmF0ZSgpCiAKICAgICBjaGFyICp0 ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQodGV4dE9iamVjdDEsIDAsIC0xKTsKICAgICBnX2Fzc2Vy dF9jbXBzdHIodGV4dCwgPT0sICJUaGlzIGlzIGEgdGVzdC4iKTsKKyAgICBnX2ZyZWUodGV4dCk7 CiAKICAgICB0ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQodGV4dE9iamVjdDIsIDAsIDUzKTsKICAg ICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICJIZWxsbyB3b3JsZC5cblRoaXMgc2VudGVuY2Ug aXMgZ3JlZW4uXG5UaGlzIG9uZSBpcyBub3QuIik7CisgICAgZ19mcmVlKHRleHQpOwogCiAgICAg Z19vYmplY3RfdW5yZWYob2JqZWN0MSk7CiAgICAgZ19vYmplY3RfdW5yZWYob2JqZWN0Mik7CkBA IC0xMjgzLDYgKzEyOTksNyBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Via2l0QXRrVGV4dEF0dHJpYnV0 ZXMoKQogICAgIGF0a19hdHRyaWJ1dGVfc2V0X2ZyZWUoc2V0Myk7CiAgICAgYXRrX2F0dHJpYnV0 ZV9zZXRfZnJlZShzZXQ0KTsKIAorICAgIGdfb2JqZWN0X3VucmVmKGNoaWxkKTsKICAgICBjaGls ZCA9IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob2JqZWN0LCAxKTsKICAgICBnX2Fz c2VydChjaGlsZCAmJiBBVEtfSVNfVEVYVChjaGlsZCkpOwogICAgIGNoaWxkVGV4dCA9IEFUS19U RVhUKGNoaWxkKTsKQEAgLTEzMDMsNiArMTMyMCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJraXRB dGtUZXh0QXR0cmlidXRlcygpCiAgICAgZ19hc3NlcnQoYXRrQXR0cmlidXRlU2V0QXR0cmlidXRl SGFzVmFsdWUoc2V0MiwgQVRLX1RFWFRfQVRUUl9CR19DT0xPUiwgIjgwLDgxLDgyIikpOwogICAg IGF0a19hdHRyaWJ1dGVfc2V0X2ZyZWUoc2V0MSk7CiAgICAgYXRrX2F0dHJpYnV0ZV9zZXRfZnJl ZShzZXQyKTsKKyAgICBnX29iamVjdF91bnJlZihjaGlsZCk7CiAKICAgICBjaGlsZCA9IGF0a19v YmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob2JqZWN0LCAyKTsKICAgICBnX2Fzc2VydChjaGls ZCAmJiBBVEtfSVNfVEVYVChjaGlsZCkpOwpAQCAtMTMyOCw2ICsxMzQ2LDcgQEAgc3RhdGljIHZv aWQgdGVzdFdlYmtpdEF0a1RleHRBdHRyaWJ1dGVzKCkKICAgICBhdGtfYXR0cmlidXRlX3NldF9m cmVlKHNldDIpOwogICAgIGF0a19hdHRyaWJ1dGVfc2V0X2ZyZWUoc2V0Myk7CiAgICAgYXRrX2F0 dHJpYnV0ZV9zZXRfZnJlZShzZXQ0KTsKKyAgICBnX29iamVjdF91bnJlZihjaGlsZCk7CiAKICAg ICBjaGlsZCA9IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob2JqZWN0LCAzKTsKICAg ICBnX2Fzc2VydChjaGlsZCAmJiBBVEtfSVNfVEVYVChjaGlsZCkpOwpAQCAtMTM0Nyw2ICsxMzY2 LDggQEAgc3RhdGljIHZvaWQgdGVzdFdlYmtpdEF0a1RleHRBdHRyaWJ1dGVzKCkKICAgICBhdGtf YXR0cmlidXRlX3NldF9mcmVlKHNldDEpOwogICAgIGF0a19hdHRyaWJ1dGVfc2V0X2ZyZWUoc2V0 Mik7CiAgICAgYXRrX2F0dHJpYnV0ZV9zZXRfZnJlZShzZXQzKTsKKworICAgIGdfb2JqZWN0X3Vu cmVmKGNoaWxkKTsKIH0KIAogc3RhdGljIGdjaGFyKiB0ZXh0U2VsZWN0aW9uQ2hhbmdlZFJlc3Vs dCA9IDA7CkBAIC0xNTE5LDYgKzE1NDAsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Via2l0QXRrVGV4 dFNlbGVjdGlvbnMoKQogCiAgICAgZ19vYmplY3RfdW5yZWYocGFyYWdyYXBoMSk7CiAgICAgZ19v YmplY3RfdW5yZWYocGFyYWdyYXBoMik7CisgICAgZ19vYmplY3RfdW5yZWYobGluayk7CiAgICAg Z19vYmplY3RfdW5yZWYobGlzdCk7CiAgICAgZ19vYmplY3RfdW5yZWYobGlzdEl0ZW0pOwogICAg IGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOwpAQCAtMTg0Miw5ICsxODY0LDE1IEBAIHN0YXRpYyB2 b2lkIHRlc3RXZWJraXRBdGtMaXN0c09mSXRlbXMoKQogICAgIGdfYXNzZXJ0X2NtcGludChhdGtf b2JqZWN0X2dldF9uX2FjY2Vzc2libGVfY2hpbGRyZW4oaXRlbTIpLCA9PSwgMSk7CiAgICAgZ19h c3NlcnRfY21waW50KGF0a19vYmplY3RfZ2V0X25fYWNjZXNzaWJsZV9jaGlsZHJlbihpdGVtMyks ID09LCAxKTsKIAotICAgIGdfYXNzZXJ0X2NtcHN0cihhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVY VChpdGVtMSksIDAsIC0xKSwgPT0sICJcMzQyXDIwMFwyNDIgdGV4dCBvbmx5Iik7Ci0gICAgZ19h c3NlcnRfY21wc3RyKGF0a190ZXh0X2dldF90ZXh0KEFUS19URVhUKGl0ZW0yKSwgMCwgLTEpLCA9 PSwgIlwzNDJcMjAwXDI0MiBsaW5rIG9ubHkiKTsKLSAgICBnX2Fzc2VydF9jbXBzdHIoYXRrX3Rl eHRfZ2V0X3RleHQoQVRLX1RFWFQoaXRlbTMpLCAwLCAtMSksID09LCAiXDM0MlwyMDBcMjQyIHRl eHQgYW5kIGEgbGluayIpOworICAgIGNoYXIqIHRleHQgPSBhdGtfdGV4dF9nZXRfdGV4dChBVEtf VEVYVChpdGVtMSksIDAsIC0xKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICJcMzQy XDIwMFwyNDIgdGV4dCBvbmx5Iik7CisgICAgZ19mcmVlKHRleHQpOworICAgIHRleHQgPSBhdGtf dGV4dF9nZXRfdGV4dChBVEtfVEVYVChpdGVtMiksIDAsIC0xKTsKKyAgICBnX2Fzc2VydF9jbXBz dHIodGV4dCwgPT0sICJcMzQyXDIwMFwyNDIgbGluayBvbmx5Iik7CisgICAgZ19mcmVlKHRleHQp OworICAgIHRleHQgPSBhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVYVChpdGVtMyksIDAsIC0xKTsK KyAgICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICJcMzQyXDIwMFwyNDIgdGV4dCBhbmQgYSBs aW5rIik7CisgICAgZ19mcmVlKHRleHQpOwogCiAgICAgZ19vYmplY3RfdW5yZWYoaXRlbTEpOwog ICAgIGdfb2JqZWN0X3VucmVmKGl0ZW0yKTsKQEAgLTE4NjQsOSArMTg5MiwxNSBAQCBzdGF0aWMg dm9pZCB0ZXN0V2Via2l0QXRrTGlzdHNPZkl0ZW1zKCkKICAgICBpdGVtMyA9IGF0a19vYmplY3Rf cmVmX2FjY2Vzc2libGVfY2hpbGQob0xpc3QsIDIpOwogICAgIGdfYXNzZXJ0KEFUS19JU19URVhU KGl0ZW0zKSk7CiAKLSAgICBnX2Fzc2VydF9jbXBzdHIoYXRrX3RleHRfZ2V0X3RleHQoQVRLX1RF WFQoaXRlbTEpLCAwLCAtMSksID09LCAiMS4gdGV4dCBvbmx5Iik7Ci0gICAgZ19hc3NlcnRfY21w c3RyKGF0a190ZXh0X2dldF90ZXh0KEFUS19URVhUKGl0ZW0yKSwgMCwgLTEpLCA9PSwgIjIuIGxp bmsgb25seSIpOwotICAgIGdfYXNzZXJ0X2NtcHN0cihhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVY VChpdGVtMyksIDAsIC0xKSwgPT0sICIzLiB0ZXh0IGFuZCBhIGxpbmsiKTsKKyAgICB0ZXh0ID0g YXRrX3RleHRfZ2V0X3RleHQoQVRLX1RFWFQoaXRlbTEpLCAwLCAtMSk7CisgICAgZ19hc3NlcnRf Y21wc3RyKHRleHQsID09LCAiMS4gdGV4dCBvbmx5Iik7CisgICAgZ19mcmVlKHRleHQpOworICAg IHRleHQgPSBhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVYVChpdGVtMiksIDAsIC0xKTsKKyAgICBn X2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICIyLiBsaW5rIG9ubHkiKTsKKyAgICBnX2ZyZWUodGV4 dCk7CisgICAgdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0KEFUS19URVhUKGl0ZW0zKSwgMCwgLTEp OworICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXh0LCA9PSwgIjMuIHRleHQgYW5kIGEgbGluayIpOwor ICAgIGdfZnJlZSh0ZXh0KTsKIAogICAgIGdfYXNzZXJ0X2NtcGludChhdGtfb2JqZWN0X2dldF9u X2FjY2Vzc2libGVfY2hpbGRyZW4oaXRlbTEpLCA9PSwgMCk7CiAgICAgZ19hc3NlcnRfY21waW50 KGF0a19vYmplY3RfZ2V0X25fYWNjZXNzaWJsZV9jaGlsZHJlbihpdGVtMiksID09LCAxKTsK 210273 2013-09-02 02:44:18 -0700 2013-09-02 07:39:52 -0700 Rebased to master bug-118675-20130902104505.patch text/plain 9930 brian.holt U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0OTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggOTA5ODQwZmQw OTdmNTM4MWI0NDUwMjVjNjkwMGI5MmU0OWIwYWE0Ny4uZjA0ODgxMjdiZTMyZTU5Y2YyODZmN2Ez MGIzOWY2ZWM1ODFiODAzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEz LTA5LTAyICBCcmlhbiBIb2x0ICA8YnJpYW4uaG9sdEBzYW1zdW5nLmNvbT4KKworICAgICAgICBb QVRLXSBMZWFrOiBMZWFrcyBpbiB0ZXN0YXRrLmMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExODY3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIG1lbW9yeSBsZWFrcyBieSBtYXRjaGluZyByZWYg Y2FsbHMgd2l0aCB1bnJlZnMuCisKKyAgICAgICAgKiB0ZXN0cy90ZXN0YXRrLmM6CisgICAgICAg ICh0ZXN0V2Via2l0QXRrQ2FyZXRPZmZzZXRzKToKKyAgICAgICAgKHRlc3RXZWJraXRBdGtDYXJl dE9mZnNldHNBbmRFeHRyYW5vdXNXaGl0ZVNwYWNlcyk6CisgICAgICAgICh0ZXN0V2Via2l0QXRr R2V0VGV4dEF0T2Zmc2V0KToKKyAgICAgICAgKHRlc3RXZWJraXRBdGtHZXRUZXh0QXRPZmZzZXRO ZXdsaW5lcyk6CisgICAgICAgICh0ZXN0V2Via2l0QXRrR2V0VGV4dEF0T2Zmc2V0VGV4dGFyZWEp OgorICAgICAgICAodGVzdFdlYmtpdEF0a0dldFRleHRBdE9mZnNldFRleHRJbnB1dCk6CisgICAg ICAgICh0ZXN0V2Via2l0QXRrR2V0VGV4dEluUGFyYWdyYXBoQW5kQm9keVNpbXBsZSk6CisgICAg ICAgICh0ZXN0V2Via2l0QXRrR2V0VGV4dEluUGFyYWdyYXBoQW5kQm9keU1vZGVyYXRlKToKKyAg ICAgICAgKHRlc3RXZWJraXRBdGtUZXh0QXR0cmlidXRlcyk6CisgICAgICAgICh0ZXN0V2Via2l0 QXRrVGV4dFNlbGVjdGlvbnMpOgorICAgICAgICAodGVzdFdlYmtpdEF0a0xpc3RzT2ZJdGVtcyk6 CisKIDIwMTMtMDgtMjkgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAg ICAgICAgIFtBdXRvbWFrZV0gbGliV2ViQ29yZURPTS5sYSBjb3VsZCB1c2UgYSBiZXR0ZXIgbmFt ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGF0ay5jIGIvU291cmNl L1dlYktpdC9ndGsvdGVzdHMvdGVzdGF0ay5jCmluZGV4IGRhNmQyMmJiOTlkNGI5ZTRkMDg3ZTY5 OGYyNWZkNGMwZTUzM2IyNzYuLjdlODY4NzliNjY4MTVkZGZmZWQ0OTA3NGRkODgyMGExMDhkOWNj MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RhdGsuYworKysgYi9T b3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMKQEAgLTM3NCwxMiArMzc0LDE0IEBAIHN0 YXRpYyB2b2lkIHRlc3RXZWJraXRBdGtDYXJldE9mZnNldHMoKQogICAgIHRleHQgPSBhdGtfdGV4 dF9nZXRfdGV4dChBVEtfVEVYVChsaXN0SXRlbSksIDAsIC0xKTsKICAgICBnX2Fzc2VydF9jbXBz dHIodGV4dCwgPT0sICIxLiBBIGxpc3QgaXRlbSIpOwogICAgIGdfZnJlZSAodGV4dCk7CisgICAg Z19vYmplY3RfdW5yZWYobGlzdEl0ZW0pOwogCiAgICAgbGlzdEl0ZW0gPSBhdGtfb2JqZWN0X3Jl Zl9hY2Nlc3NpYmxlX2NoaWxkKGxpc3QsIDEpOwogICAgIGdfYXNzZXJ0KEFUS19JU19URVhUKGxp c3RJdGVtKSk7CiAgICAgdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0KEFUS19URVhUKGxpc3RJdGVt KSwgMCwgLTEpOwogICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXh0LCA9PSwgIjIuIEJsb2NrIHNwYW4g aW4gYSBsaXN0IGl0ZW1cbklubGluZSBzcGFuIGluIGEgbGlzdCBpdGVtIik7CiAgICAgZ19mcmVl ICh0ZXh0KTsKKyAgICBnX29iamVjdF91bnJlZihsaXN0SXRlbSk7CiAKICAgICBsaXN0SXRlbSA9 IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQobGlzdCwgMik7CiAgICAgZ19hc3NlcnQo QVRLX0lTX1RFWFQobGlzdEl0ZW0pKTsKQEAgLTQ1Myw2ICs0NTUsNyBAQCBzdGF0aWMgdm9pZCB0 ZXN0V2Via2l0QXRrQ2FyZXRPZmZzZXRzKCkKICAgICBnX2Fzc2VydF9jbXBpbnQocmVzdWx0LCA9 PSwgVFJVRSk7CiAgICAgb2Zmc2V0ID0gYXRrX3RleHRfZ2V0X2NhcmV0X29mZnNldChBVEtfVEVY VCh0YWJsZUNlbGwpKTsKICAgICBnX2Fzc2VydF9jbXBpbnQob2Zmc2V0LCA9PSwgMik7CisgICAg Z19vYmplY3RfdW5yZWYodGFibGVDZWxsKTsKIAogICAgIC8qIEV2ZW4gZW1wdHkgdGFibGUgY2Vs bHMgc2hvdWxkIGltcGxlbWVudCBBdGtUZXh0LCBidXQgcmVwb3J0IGFuIGVtcHR5IHN0cmluZyAq LwogICAgIHRhYmxlQ2VsbCA9IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQodGFibGUs IDEpOwpAQCAtNDYxLDYgKzQ2NCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJraXRBdGtDYXJldE9m ZnNldHMoKQogICAgIHRleHQgPSBhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVYVCh0YWJsZUNlbGwp LCAwLCAtMSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKHRleHQsID09LCAiIik7CiAgICAgZ19mcmVl KHRleHQpOworICAgIGdfb2JqZWN0X3VucmVmKHRhYmxlQ2VsbCk7CiAKICAgICB0YWJsZUNlbGwg PSBhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxlX2NoaWxkKHRhYmxlLCAyKTsKICAgICBnX2Fzc2Vy dChBVEtfSVNfVEVYVCh0YWJsZUNlbGwpKTsKQEAgLTQ2OCw2ICs0NzIsNyBAQCBzdGF0aWMgdm9p ZCB0ZXN0V2Via2l0QXRrQ2FyZXRPZmZzZXRzKCkKICAgICB0ZXh0ID0gYXRrX3RleHRfZ2V0X3Rl eHQoQVRLX1RFWFQodGFibGVDZWxsKSwgMCwgLTEpOwogICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXh0 LCA9PSwgIkJsb2NrIHNwYW4gaW4gYSBsaW5rIGluIGEgdGFibGUgY2VsbFxuSW5saW5lIHNwYW4g aW4gYSBsaW5rIGluIGEgdGFibGUgY2VsbCIpOwogICAgIGdfZnJlZSh0ZXh0KTsKKyAgICBnX29i amVjdF91bnJlZih0YWJsZUNlbGwpOwogCiAgICAgdGFibGVDZWxsID0gYXRrX29iamVjdF9yZWZf YWNjZXNzaWJsZV9jaGlsZCh0YWJsZSwgMyk7CiAgICAgZ19hc3NlcnQoQVRLX0lTX1RFWFQodGFi bGVDZWxsKSk7CkBAIC00ODIsNiArNDg3LDcgQEAgc3RhdGljIHZvaWQgdGVzdFdlYmtpdEF0a0Nh cmV0T2Zmc2V0cygpCiAgICAgdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0KEFUS19URVhUKGhlYWRl ciksIDAsIC0xKTsKICAgICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICJCbG9jayBzcGFuIGlu IGEgbGluayBpbiBhIGhlYWRpbmdcbklubGluZSBzcGFuIGluIGEgbGluayBpbiBhIGhlYWRpbmci KTsKICAgICBnX2ZyZWUodGV4dCk7CisgICAgZ19vYmplY3RfdW5yZWYoaGVhZGVyKTsKIAogICAg IGhlYWRlciA9IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob2JqZWN0LCA2KTsKICAg ICBnX2Fzc2VydChBVEtfSVNfVEVYVChoZWFkZXIpKTsKQEAgLTU0OCw2ICs1NTQsNyBAQCBzdGF0 aWMgdm9pZCB0ZXN0V2Via2l0QXRrQ2FyZXRPZmZzZXRzQW5kRXh0cmFub3VzV2hpdGVTcGFjZXMo KQogICAgIGNhcmV0T2Zmc2V0ID0gYXRrX3RleHRfZ2V0X2NhcmV0X29mZnNldCh0ZXh0T2JqZWN0 KTsKICAgICBnX2Fzc2VydF9jbXBpbnQoY2FyZXRPZmZzZXQsID09LCBjaGFyYWN0ZXJDb3VudCk7 CiAKKyAgICBnX29iamVjdF91bnJlZihvYmplY3QpOwogICAgIGdfb2JqZWN0X3VucmVmKHdlYlZp ZXcpOwogfQogCkBAIC04MDUsNiArODEyLDcgQEAgc3RhdGljIHZvaWQgdGVzdFdlYmtpdEF0a0dl dFRleHRBdE9mZnNldCgpCiAKICAgICBydW5HZXRUZXh0VGVzdHModGV4dE9iamVjdCk7CiAKKyAg ICBnX29iamVjdF91bnJlZihvYmplY3QpOwogICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOwog fQogCkBAIC04MjcsNiArODM1LDcgQEAgc3RhdGljIHZvaWQgdGVzdFdlYmtpdEF0a0dldFRleHRB dE9mZnNldE5ld2xpbmVzKCkKIAogICAgIHJ1bkdldFRleHRUZXN0cyh0ZXh0T2JqZWN0KTsKIAor ICAgIGdfb2JqZWN0X3VucmVmKG9iamVjdCk7CiAgICAgZ19vYmplY3RfdW5yZWYod2ViVmlldyk7 CiB9CiAKQEAgLTg0MSwxNiArODUwLDE4IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJraXRBdGtHZXRU ZXh0QXRPZmZzZXRUZXh0YXJlYSgpCiAgICAgLyogR2V0IHRvIHRoZSBpbm5lciBBdGtUZXh0IG9i amVjdC4gKi8KICAgICBBdGtPYmplY3QqIG9iamVjdCA9IGdldFdlYkFyZWFPYmplY3Qod2ViVmll dyk7CiAgICAgZ19hc3NlcnQob2JqZWN0KTsKLSAgICBvYmplY3QgPSBhdGtfb2JqZWN0X3JlZl9h Y2Nlc3NpYmxlX2NoaWxkKG9iamVjdCwgMCk7Ci0gICAgZ19hc3NlcnQob2JqZWN0KTsKLSAgICBv YmplY3QgPSBhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxlX2NoaWxkKG9iamVjdCwgMCk7Ci0gICAg Z19hc3NlcnQob2JqZWN0KTsKKyAgICBBdGtPYmplY3QqIGNoaWxkID0gYXRrX29iamVjdF9yZWZf YWNjZXNzaWJsZV9jaGlsZChvYmplY3QsIDApOworICAgIGdfYXNzZXJ0KGNoaWxkKTsKKyAgICBB dGtPYmplY3QqIGdyYW5kY2hpbGQgPSBhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxlX2NoaWxkKGNo aWxkLCAwKTsKKyAgICBnX2Fzc2VydChncmFuZGNoaWxkKTsKIAotICAgIEF0a1RleHQqIHRleHRP YmplY3QgPSBBVEtfVEVYVChvYmplY3QpOworICAgIEF0a1RleHQqIHRleHRPYmplY3QgPSBBVEtf VEVYVChncmFuZGNoaWxkKTsKICAgICBnX2Fzc2VydChBVEtfSVNfVEVYVCh0ZXh0T2JqZWN0KSk7 CiAKICAgICBydW5HZXRUZXh0VGVzdHModGV4dE9iamVjdCk7CiAKKyAgICBnX29iamVjdF91bnJl ZihjaGlsZCk7CisgICAgZ19vYmplY3RfdW5yZWYoZ3JhbmRjaGlsZCk7CiAgICAgZ19vYmplY3Rf dW5yZWYod2ViVmlldyk7CiB9CiAKQEAgLTg2NSwxNiArODc2LDE4IEBAIHN0YXRpYyB2b2lkIHRl c3RXZWJraXRBdGtHZXRUZXh0QXRPZmZzZXRUZXh0SW5wdXQoKQogICAgIC8qIEdldCB0byB0aGUg aW5uZXIgQXRrVGV4dCBvYmplY3QuICovCiAgICAgQXRrT2JqZWN0KiBvYmplY3QgPSBnZXRXZWJB cmVhT2JqZWN0KHdlYlZpZXcpOwogICAgIGdfYXNzZXJ0KG9iamVjdCk7Ci0gICAgb2JqZWN0ID0g YXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChvYmplY3QsIDApOwotICAgIGdfYXNzZXJ0 KG9iamVjdCk7Ci0gICAgb2JqZWN0ID0gYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChv YmplY3QsIDApOwotICAgIGdfYXNzZXJ0KG9iamVjdCk7CisgICAgQXRrT2JqZWN0KiBjaGlsZCA9 IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob2JqZWN0LCAwKTsKKyAgICBnX2Fzc2Vy dChjaGlsZCk7CisgICAgQXRrT2JqZWN0KiBncmFuZGNoaWxkID0gYXRrX29iamVjdF9yZWZfYWNj ZXNzaWJsZV9jaGlsZChjaGlsZCwgMCk7CisgICAgZ19hc3NlcnQoZ3JhbmRjaGlsZCk7CiAKLSAg ICBBdGtUZXh0KiB0ZXh0T2JqZWN0ID0gQVRLX1RFWFQob2JqZWN0KTsKKyAgICBBdGtUZXh0KiB0 ZXh0T2JqZWN0ID0gQVRLX1RFWFQoZ3JhbmRjaGlsZCk7CiAgICAgZ19hc3NlcnQoQVRLX0lTX1RF WFQodGV4dE9iamVjdCkpOwogCiAgICAgcnVuR2V0VGV4dFRlc3RzKHRleHRPYmplY3QpOwogCisg ICAgZ19vYmplY3RfdW5yZWYoY2hpbGQpOworICAgIGdfb2JqZWN0X3VucmVmKGdyYW5kY2hpbGQp OwogICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOwogfQogCkBAIC0xMTQ5LDkgKzExNjIsMTEg QEAgc3RhdGljIHZvaWQgdGVzdFdlYmtpdEF0a0dldFRleHRJblBhcmFncmFwaEFuZEJvZHlTaW1w bGUoKQogCiAgICAgY2hhciAqdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0KHRleHRPYmplY3QxLCAw LCAtMSk7CiAgICAgZ19hc3NlcnRfY21wc3RyKHRleHQsID09LCAiVGhpcyBpcyBhIHRlc3QuIik7 CisgICAgZ19mcmVlKHRleHQpOwogCiAgICAgdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0KHRleHRP YmplY3QyLCAwLCAxMik7CiAgICAgZ19hc3NlcnRfY21wc3RyKHRleHQsID09LCAiSGVsbG8gd29y bGQuIik7CisgICAgZ19mcmVlKHRleHQpOwogCiAgICAgZ19vYmplY3RfdW5yZWYob2JqZWN0MSk7 CiAgICAgZ19vYmplY3RfdW5yZWYob2JqZWN0Mik7CkBAIC0xMTgxLDkgKzExOTYsMTEgQEAgc3Rh dGljIHZvaWQgdGVzdFdlYmtpdEF0a0dldFRleHRJblBhcmFncmFwaEFuZEJvZHlNb2RlcmF0ZSgp CiAKICAgICBjaGFyICp0ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQodGV4dE9iamVjdDEsIDAsIC0x KTsKICAgICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICJUaGlzIGlzIGEgdGVzdC4iKTsKKyAg ICBnX2ZyZWUodGV4dCk7CiAKICAgICB0ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQodGV4dE9iamVj dDIsIDAsIDUzKTsKICAgICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICJIZWxsbyB3b3JsZC5c blRoaXMgc2VudGVuY2UgaXMgZ3JlZW4uXG5UaGlzIG9uZSBpcyBub3QuIik7CisgICAgZ19mcmVl KHRleHQpOwogCiAgICAgZ19vYmplY3RfdW5yZWYob2JqZWN0MSk7CiAgICAgZ19vYmplY3RfdW5y ZWYob2JqZWN0Mik7CkBAIC0xMzgyLDYgKzEzOTksNyBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Via2l0 QXRrVGV4dEF0dHJpYnV0ZXMoKQogICAgIGF0a19hdHRyaWJ1dGVfc2V0X2ZyZWUoc2V0Myk7CiAg ICAgYXRrX2F0dHJpYnV0ZV9zZXRfZnJlZShzZXQ0KTsKIAorICAgIGdfb2JqZWN0X3VucmVmKGNo aWxkKTsKICAgICBjaGlsZCA9IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob2JqZWN0 LCAxKTsKICAgICBnX2Fzc2VydChjaGlsZCAmJiBBVEtfSVNfVEVYVChjaGlsZCkpOwogICAgIGNo aWxkVGV4dCA9IEFUS19URVhUKGNoaWxkKTsKQEAgLTE0MDIsNiArMTQyMCw3IEBAIHN0YXRpYyB2 b2lkIHRlc3RXZWJraXRBdGtUZXh0QXR0cmlidXRlcygpCiAgICAgZ19hc3NlcnQoYXRrQXR0cmli dXRlU2V0QXR0cmlidXRlSGFzVmFsdWUoc2V0MiwgQVRLX1RFWFRfQVRUUl9CR19DT0xPUiwgIjgw LDgxLDgyIikpOwogICAgIGF0a19hdHRyaWJ1dGVfc2V0X2ZyZWUoc2V0MSk7CiAgICAgYXRrX2F0 dHJpYnV0ZV9zZXRfZnJlZShzZXQyKTsKKyAgICBnX29iamVjdF91bnJlZihjaGlsZCk7CiAKICAg ICBjaGlsZCA9IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob2JqZWN0LCAyKTsKICAg ICBnX2Fzc2VydChjaGlsZCAmJiBBVEtfSVNfVEVYVChjaGlsZCkpOwpAQCAtMTQyNyw2ICsxNDQ2 LDcgQEAgc3RhdGljIHZvaWQgdGVzdFdlYmtpdEF0a1RleHRBdHRyaWJ1dGVzKCkKICAgICBhdGtf YXR0cmlidXRlX3NldF9mcmVlKHNldDIpOwogICAgIGF0a19hdHRyaWJ1dGVfc2V0X2ZyZWUoc2V0 Myk7CiAgICAgYXRrX2F0dHJpYnV0ZV9zZXRfZnJlZShzZXQ0KTsKKyAgICBnX29iamVjdF91bnJl ZihjaGlsZCk7CiAKICAgICBjaGlsZCA9IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQo b2JqZWN0LCAzKTsKICAgICBnX2Fzc2VydChjaGlsZCAmJiBBVEtfSVNfVEVYVChjaGlsZCkpOwpA QCAtMTQ0Niw2ICsxNDY2LDggQEAgc3RhdGljIHZvaWQgdGVzdFdlYmtpdEF0a1RleHRBdHRyaWJ1 dGVzKCkKICAgICBhdGtfYXR0cmlidXRlX3NldF9mcmVlKHNldDEpOwogICAgIGF0a19hdHRyaWJ1 dGVfc2V0X2ZyZWUoc2V0Mik7CiAgICAgYXRrX2F0dHJpYnV0ZV9zZXRfZnJlZShzZXQzKTsKKwor ICAgIGdfb2JqZWN0X3VucmVmKGNoaWxkKTsKIH0KIAogc3RhdGljIGdjaGFyKiB0ZXh0U2VsZWN0 aW9uQ2hhbmdlZFJlc3VsdCA9IDA7CkBAIC0xNjE4LDYgKzE2NDAsNyBAQCBzdGF0aWMgdm9pZCB0 ZXN0V2Via2l0QXRrVGV4dFNlbGVjdGlvbnMoKQogCiAgICAgZ19vYmplY3RfdW5yZWYocGFyYWdy YXBoMSk7CiAgICAgZ19vYmplY3RfdW5yZWYocGFyYWdyYXBoMik7CisgICAgZ19vYmplY3RfdW5y ZWYobGluayk7CiAgICAgZ19vYmplY3RfdW5yZWYobGlzdCk7CiAgICAgZ19vYmplY3RfdW5yZWYo bGlzdEl0ZW0pOwogICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOwpAQCAtMTk0MSw5ICsxOTY0 LDE1IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJraXRBdGtMaXN0c09mSXRlbXMoKQogICAgIGdfYXNz ZXJ0X2NtcGludChhdGtfb2JqZWN0X2dldF9uX2FjY2Vzc2libGVfY2hpbGRyZW4oaXRlbTIpLCA9 PSwgMSk7CiAgICAgZ19hc3NlcnRfY21waW50KGF0a19vYmplY3RfZ2V0X25fYWNjZXNzaWJsZV9j aGlsZHJlbihpdGVtMyksID09LCAxKTsKIAotICAgIGdfYXNzZXJ0X2NtcHN0cihhdGtfdGV4dF9n ZXRfdGV4dChBVEtfVEVYVChpdGVtMSksIDAsIC0xKSwgPT0sICJcMzQyXDIwMFwyNDIgdGV4dCBv bmx5Iik7Ci0gICAgZ19hc3NlcnRfY21wc3RyKGF0a190ZXh0X2dldF90ZXh0KEFUS19URVhUKGl0 ZW0yKSwgMCwgLTEpLCA9PSwgIlwzNDJcMjAwXDI0MiBsaW5rIG9ubHkiKTsKLSAgICBnX2Fzc2Vy dF9jbXBzdHIoYXRrX3RleHRfZ2V0X3RleHQoQVRLX1RFWFQoaXRlbTMpLCAwLCAtMSksID09LCAi XDM0MlwyMDBcMjQyIHRleHQgYW5kIGEgbGluayIpOworICAgIGNoYXIqIHRleHQgPSBhdGtfdGV4 dF9nZXRfdGV4dChBVEtfVEVYVChpdGVtMSksIDAsIC0xKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIo dGV4dCwgPT0sICJcMzQyXDIwMFwyNDIgdGV4dCBvbmx5Iik7CisgICAgZ19mcmVlKHRleHQpOwor ICAgIHRleHQgPSBhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVYVChpdGVtMiksIDAsIC0xKTsKKyAg ICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICJcMzQyXDIwMFwyNDIgbGluayBvbmx5Iik7Cisg ICAgZ19mcmVlKHRleHQpOworICAgIHRleHQgPSBhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVYVChp dGVtMyksIDAsIC0xKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICJcMzQyXDIwMFwy NDIgdGV4dCBhbmQgYSBsaW5rIik7CisgICAgZ19mcmVlKHRleHQpOwogCiAgICAgZ19vYmplY3Rf dW5yZWYoaXRlbTEpOwogICAgIGdfb2JqZWN0X3VucmVmKGl0ZW0yKTsKQEAgLTE5NjMsOSArMTk5 MiwxNSBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Via2l0QXRrTGlzdHNPZkl0ZW1zKCkKICAgICBpdGVt MyA9IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob0xpc3QsIDIpOwogICAgIGdfYXNz ZXJ0KEFUS19JU19URVhUKGl0ZW0zKSk7CiAKLSAgICBnX2Fzc2VydF9jbXBzdHIoYXRrX3RleHRf Z2V0X3RleHQoQVRLX1RFWFQoaXRlbTEpLCAwLCAtMSksID09LCAiMS4gdGV4dCBvbmx5Iik7Ci0g ICAgZ19hc3NlcnRfY21wc3RyKGF0a190ZXh0X2dldF90ZXh0KEFUS19URVhUKGl0ZW0yKSwgMCwg LTEpLCA9PSwgIjIuIGxpbmsgb25seSIpOwotICAgIGdfYXNzZXJ0X2NtcHN0cihhdGtfdGV4dF9n ZXRfdGV4dChBVEtfVEVYVChpdGVtMyksIDAsIC0xKSwgPT0sICIzLiB0ZXh0IGFuZCBhIGxpbmsi KTsKKyAgICB0ZXh0ID0gYXRrX3RleHRfZ2V0X3RleHQoQVRLX1RFWFQoaXRlbTEpLCAwLCAtMSk7 CisgICAgZ19hc3NlcnRfY21wc3RyKHRleHQsID09LCAiMS4gdGV4dCBvbmx5Iik7CisgICAgZ19m cmVlKHRleHQpOworICAgIHRleHQgPSBhdGtfdGV4dF9nZXRfdGV4dChBVEtfVEVYVChpdGVtMiks IDAsIC0xKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIodGV4dCwgPT0sICIyLiBsaW5rIG9ubHkiKTsK KyAgICBnX2ZyZWUodGV4dCk7CisgICAgdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0KEFUS19URVhU KGl0ZW0zKSwgMCwgLTEpOworICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXh0LCA9PSwgIjMuIHRleHQg YW5kIGEgbGluayIpOworICAgIGdfZnJlZSh0ZXh0KTsKIAogICAgIGdfYXNzZXJ0X2NtcGludChh dGtfb2JqZWN0X2dldF9uX2FjY2Vzc2libGVfY2hpbGRyZW4oaXRlbTEpLCA9PSwgMCk7CiAgICAg Z19hc3NlcnRfY21waW50KGF0a19vYmplY3RfZ2V0X25fYWNjZXNzaWJsZV9jaGlsZHJlbihpdGVt MiksID09LCAxKTsK