72339 2011-11-14 17:30:17 -0800 A little bit of arguments / activation cleanup 2011-11-14 17:39:57 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oldest_to_newest 502531 0 ggaren 2011-11-14 17:30:17 -0800 A little bit of arguments / activation cleanup 502535 1 115072 ggaren 2011-11-14 17:33:01 -0800 Created attachment 115072 Patch 502543 2 ggaren 2011-11-14 17:39:57 -0800 Committed r100224: <http://trac.webkit.org/changeset/100224> 115072 2011-11-14 17:33:01 -0800 2011-11-14 17:39:14 -0800 Patch bug-72339-20111114173300.patch text/plain 12594 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTAwMjIyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBA CisyMDExLTExLTE0ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgQSBsaXR0bGUgYml0IG9mIGFyZ3VtZW50cyAvIGFjdGl2YXRpb24gY2xlYW51cAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIzMzkKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFJlbmFtZWQg Y29weVJlZ2lzdGVycyA9PiB0ZWFyT2ZmIHRvIG1hdGNoIGJ5dGVjb2RlIGFuZCBvdGhlciB0ZXJt aW5vbG9neS4KKyAgICAgICAgCisgICAgICAgIFJlbmFtZWQgc2V0QWN0aXZhdGlvbiA9PiBkaWRU ZWFyT2ZmQWN0aXZhdGlvbiB0byBpbmRpY2F0ZSB0aGF0IHRoaXMgaXMgYQorICAgICAgICBub3Rp ZmljYXRpb24gdGhlIG9iamVjdCBtYXkgY2hvb3NlIHRvIGlnbm9yZS4gTW92ZWQgIlNob3VsZCBJ IGlnbm9yZT8iCisgICAgICAgIGNvZGUgaW50byB0aGUgYXJndW1lbnRzIG9iamVjdCB0byBhdm9p ZCBkdXBsaWNhdGlvbiBlbHNld2hlcmUuCisKKyAgICAgICAgKiBpbnRlcnByZXRlci9JbnRlcnBy ZXRlci5jcHA6CisgICAgICAgIChKU0M6OkludGVycHJldGVyOjp1bndpbmRDYWxsRnJhbWUpOgor ICAgICAgICAoSlNDOjpJbnRlcnByZXRlcjo6cHJpdmF0ZUV4ZWN1dGUpOgorICAgICAgICAoSlND OjpJbnRlcnByZXRlcjo6cmV0cmlldmVBcmd1bWVudHMpOgorICAgICAgICAqIGppdC9KSVRTdHVi cy5jcHA6CisgICAgICAgIChKU0M6OkRFRklORV9TVFVCX0ZVTkNUSU9OKToKKyAgICAgICAgKiBy dW50aW1lL0FyZ3VtZW50cy5oOgorICAgICAgICAoSlNDOjpBcmd1bWVudHM6OmNyZWF0ZUFuZFRl YXJPZmYpOgorICAgICAgICAoSlNDOjpBcmd1bWVudHM6OmRpZFRlYXJPZmZBY3RpdmF0aW9uKToK KyAgICAgICAgKEpTQzo6QXJndW1lbnRzOjpmaW5pc2hDcmVhdGlvbkJ1dERvbnRUZWFyT2ZmKToK KyAgICAgICAgKEpTQzo6QXJndW1lbnRzOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgIChKU0M6 OkFyZ3VtZW50czo6ZmluaXNoQ3JlYXRpb25BbmRUZWFyT2ZmKToKKyAgICAgICAgKEpTQzo6QXJn dW1lbnRzOjp0ZWFyT2ZmKToKKworICAgICAgICAqIHJ1bnRpbWUvSlNBY3RpdmF0aW9uLmg6Cisg ICAgICAgIChKU0M6OkpTQWN0aXZhdGlvbjo6dGVhck9mZik6IE1vdmVkIEFjdGl2YXRpb24ncyBj b2RlIGludG8gaXRzIG93biBoZWFkZXIKKyAgICAgICAgYmVjYXVzZSB0aGF0J3Mgd2hlcmUgaXQg YmVsb25ncy4KKwogMjAxMS0xMS0xNCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgog CiAgICAgICAgIERGRydzIGlubGluZSByZWZlcmVuY2VzIHRvIG9iamVjdHMgc2hvdWxkIGJlIHRy YWNrZWQKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0lu dGVycHJldGVyLmNwcAkocmV2aXNpb24gMTAwMTk5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjk1LDE0ICs2 OTUsMTIgQEAgTkVWRVJfSU5MSU5FIGJvb2wgSW50ZXJwcmV0ZXI6OnVud2luZENhbAogCiAgICAg ICAgIGNhbGxGcmFtZS0+c2V0U2NvcGVDaGFpbihzY29wZUNoYWluKTsKICAgICAgICAgSlNBY3Rp dmF0aW9uKiBhY3RpdmF0aW9uID0gYXNBY3RpdmF0aW9uKHNjb3BlQ2hhaW4tPm9iamVjdC5nZXQo KSk7Ci0gICAgICAgIGFjdGl2YXRpb24tPmNvcHlSZWdpc3RlcnMoKnNjb3BlQ2hhaW4tPmdsb2Jh bERhdGEpOwotICAgICAgICBpZiAoSlNWYWx1ZSBhcmd1bWVudHMgPSBjYWxsRnJhbWUtPnVuY2hl Y2tlZFIodW5tb2RpZmllZEFyZ3VtZW50c1JlZ2lzdGVyKG9sZENvZGVCbG9jay0+YXJndW1lbnRz UmVnaXN0ZXIoKSkpLmpzVmFsdWUoKSkgewotICAgICAgICAgICAgaWYgKCFvbGRDb2RlQmxvY2st PmlzU3RyaWN0TW9kZSgpKQotICAgICAgICAgICAgICAgIGFzQXJndW1lbnRzKGFyZ3VtZW50cykt PnNldEFjdGl2YXRpb24oY2FsbEZyYW1lLT5nbG9iYWxEYXRhKCksIGFjdGl2YXRpb24pOwotICAg ICAgICB9CisgICAgICAgIGFjdGl2YXRpb24tPnRlYXJPZmYoKnNjb3BlQ2hhaW4tPmdsb2JhbERh dGEpOworICAgICAgICBpZiAoSlNWYWx1ZSBhcmd1bWVudHMgPSBjYWxsRnJhbWUtPnVuY2hlY2tl ZFIodW5tb2RpZmllZEFyZ3VtZW50c1JlZ2lzdGVyKG9sZENvZGVCbG9jay0+YXJndW1lbnRzUmVn aXN0ZXIoKSkpLmpzVmFsdWUoKSkKKyAgICAgICAgICAgIGFzQXJndW1lbnRzKGFyZ3VtZW50cykt PmRpZFRlYXJPZmZBY3RpdmF0aW9uKGNhbGxGcmFtZS0+Z2xvYmFsRGF0YSgpLCBhY3RpdmF0aW9u KTsKICAgICB9IGVsc2UgaWYgKG9sZENvZGVCbG9jay0+dXNlc0FyZ3VtZW50cygpICYmICFvbGRD b2RlQmxvY2stPmlzU3RyaWN0TW9kZSgpKSB7CiAgICAgICAgIGlmIChKU1ZhbHVlIGFyZ3VtZW50 cyA9IGNhbGxGcmFtZS0+dW5jaGVja2VkUih1bm1vZGlmaWVkQXJndW1lbnRzUmVnaXN0ZXIob2xk Q29kZUJsb2NrLT5hcmd1bWVudHNSZWdpc3RlcigpKSkuanNWYWx1ZSgpKQotICAgICAgICAgICAg YXNBcmd1bWVudHMoYXJndW1lbnRzKS0+Y29weVJlZ2lzdGVycyhjYWxsRnJhbWUtPmdsb2JhbERh dGEoKSk7CisgICAgICAgICAgICBhc0FyZ3VtZW50cyhhcmd1bWVudHMpLT50ZWFyT2ZmKGNhbGxG cmFtZS0+Z2xvYmFsRGF0YSgpKTsKICAgICB9CiAKICAgICBDYWxsRnJhbWUqIGNhbGxlckZyYW1l ID0gY2FsbEZyYW1lLT5jYWxsZXJGcmFtZSgpOwpAQCAtNDQ1MywxNSArNDQ1MSwxMyBAQCBza2lw X2lkX2N1c3RvbV9zZWxmOgogICAgICAgICBBU1NFUlQoY29kZUJsb2NrLT5uZWVkc0Z1bGxTY29w ZUNoYWluKCkpOwogICAgICAgICBKU1ZhbHVlIGFjdGl2YXRpb25WYWx1ZSA9IGNhbGxGcmFtZS0+ cihhY3RpdmF0aW9uKS5qc1ZhbHVlKCk7CiAgICAgICAgIGlmIChhY3RpdmF0aW9uVmFsdWUpIHsK LSAgICAgICAgICAgIGFzQWN0aXZhdGlvbihhY3RpdmF0aW9uVmFsdWUpLT5jb3B5UmVnaXN0ZXJz KCpnbG9iYWxEYXRhKTsKKyAgICAgICAgICAgIGFzQWN0aXZhdGlvbihhY3RpdmF0aW9uVmFsdWUp LT50ZWFyT2ZmKCpnbG9iYWxEYXRhKTsKIAotICAgICAgICAgICAgaWYgKEpTVmFsdWUgYXJndW1l bnRzVmFsdWUgPSBjYWxsRnJhbWUtPnIodW5tb2RpZmllZEFyZ3VtZW50c1JlZ2lzdGVyKGFyZ3Vt ZW50cykpLmpzVmFsdWUoKSkgewotICAgICAgICAgICAgICAgIGlmICghY29kZUJsb2NrLT5pc1N0 cmljdE1vZGUoKSkKLSAgICAgICAgICAgICAgICAgICAgYXNBcmd1bWVudHMoYXJndW1lbnRzVmFs dWUpLT5zZXRBY3RpdmF0aW9uKCpnbG9iYWxEYXRhLCBhc0FjdGl2YXRpb24oYWN0aXZhdGlvblZh bHVlKSk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoSlNWYWx1ZSBhcmd1bWVudHNW YWx1ZSA9IGNhbGxGcmFtZS0+cih1bm1vZGlmaWVkQXJndW1lbnRzUmVnaXN0ZXIoYXJndW1lbnRz KSkuanNWYWx1ZSgpKQorICAgICAgICAgICAgICAgIGFzQXJndW1lbnRzKGFyZ3VtZW50c1ZhbHVl KS0+ZGlkVGVhck9mZkFjdGl2YXRpb24oKmdsb2JhbERhdGEsIGFzQWN0aXZhdGlvbihhY3RpdmF0 aW9uVmFsdWUpKTsKICAgICAgICAgfSBlbHNlIGlmIChKU1ZhbHVlIGFyZ3VtZW50c1ZhbHVlID0g Y2FsbEZyYW1lLT5yKHVubW9kaWZpZWRBcmd1bWVudHNSZWdpc3Rlcihhcmd1bWVudHMpKS5qc1Zh bHVlKCkpIHsKICAgICAgICAgICAgIGlmICghY29kZUJsb2NrLT5pc1N0cmljdE1vZGUoKSkKLSAg ICAgICAgICAgICAgICBhc0FyZ3VtZW50cyhhcmd1bWVudHNWYWx1ZSktPmNvcHlSZWdpc3RlcnMo Kmdsb2JhbERhdGEpOworICAgICAgICAgICAgICAgIGFzQXJndW1lbnRzKGFyZ3VtZW50c1ZhbHVl KS0+dGVhck9mZigqZ2xvYmFsRGF0YSk7CiAgICAgICAgIH0KIAogICAgICAgICB2UEMgKz0gT1BD T0RFX0xFTkdUSChvcF90ZWFyX29mZl9hY3RpdmF0aW9uKTsKQEAgLTQ0ODMsNyArNDQ3OSw3IEBA IHNraXBfaWRfY3VzdG9tX3NlbGY6CiAgICAgICAgIEFTU0VSVCghY29kZUJsb2NrLT5uZWVkc0Z1 bGxTY29wZUNoYWluKCkgJiYgY29kZUJsb2NrLT5vd25lckV4ZWN1dGFibGUoKS0+dXNlc0FyZ3Vt ZW50cygpKTsKIAogICAgICAgICBpZiAoSlNWYWx1ZSBhcmd1bWVudHMgPSBjYWxsRnJhbWUtPnIo dW5tb2RpZmllZEFyZ3VtZW50c1JlZ2lzdGVyKHNyYzEpKS5qc1ZhbHVlKCkpCi0gICAgICAgICAg ICBhc0FyZ3VtZW50cyhhcmd1bWVudHMpLT5jb3B5UmVnaXN0ZXJzKCpnbG9iYWxEYXRhKTsKKyAg ICAgICAgICAgIGFzQXJndW1lbnRzKGFyZ3VtZW50cyktPnRlYXJPZmYoKmdsb2JhbERhdGEpOwog CiAgICAgICAgIHZQQyArPSBPUENPREVfTEVOR1RIKG9wX3RlYXJfb2ZmX2FyZ3VtZW50cyk7CiAg ICAgICAgIE5FWFRfSU5TVFJVQ1RJT04oKTsKQEAgLTUxNDQsNyArNTE0MCw3IEBAIEpTVmFsdWUg SW50ZXJwcmV0ZXI6OnJldHJpZXZlQXJndW1lbnRzKEMKICAgICAgICAgcmV0dXJuIGFyZ3VtZW50 czsKICAgICB9CiAKLSAgICByZXR1cm4gQXJndW1lbnRzOjpjcmVhdGVBbmRDb3B5UmVnaXN0ZXJz KGZ1bmN0aW9uQ2FsbEZyYW1lLT5nbG9iYWxEYXRhKCksIGZ1bmN0aW9uQ2FsbEZyYW1lKTsKKyAg ICByZXR1cm4gQXJndW1lbnRzOjpjcmVhdGVBbmRUZWFyT2ZmKGZ1bmN0aW9uQ2FsbEZyYW1lLT5n bG9iYWxEYXRhKCksIGZ1bmN0aW9uQ2FsbEZyYW1lKTsKIH0KIAogSlNWYWx1ZSBJbnRlcnByZXRl cjo6cmV0cmlldmVDYWxsZXIoQ2FsbEZyYW1lKiBjYWxsRnJhbWUsIEpTRnVuY3Rpb24qIGZ1bmN0 aW9uKSBjb25zdApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVicy5jcHAJKHJl dmlzaW9uIDEwMDE5OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnMuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yMzk0LDE2ICsyMzk0LDE0IEBAIERFRklORV9TVFVCX0ZVTkNU SU9OKHZvaWQsIG9wX3RlYXJfb2ZmX2EKICAgICBpZiAoIWFjdGl2YXRpb25WYWx1ZSkgewogICAg ICAgICBpZiAoSlNWYWx1ZSB2ID0gc3RhY2tGcmFtZS5hcmdzWzFdLmpzVmFsdWUoKSkgewogICAg ICAgICAgICAgaWYgKCFzdGFja0ZyYW1lLmNhbGxGcmFtZS0+Y29kZUJsb2NrKCktPmlzU3RyaWN0 TW9kZSgpKQotICAgICAgICAgICAgICAgIGFzQXJndW1lbnRzKHYpLT5jb3B5UmVnaXN0ZXJzKCpz dGFja0ZyYW1lLmdsb2JhbERhdGEpOworICAgICAgICAgICAgICAgIGFzQXJndW1lbnRzKHYpLT50 ZWFyT2ZmKCpzdGFja0ZyYW1lLmdsb2JhbERhdGEpOwogICAgICAgICB9CiAgICAgICAgIHJldHVy bjsKICAgICB9CiAgICAgSlNBY3RpdmF0aW9uKiBhY3RpdmF0aW9uID0gYXNBY3RpdmF0aW9uKHN0 YWNrRnJhbWUuYXJnc1swXS5qc1ZhbHVlKCkpOwotICAgIGFjdGl2YXRpb24tPmNvcHlSZWdpc3Rl cnMoKnN0YWNrRnJhbWUuZ2xvYmFsRGF0YSk7Ci0gICAgaWYgKEpTVmFsdWUgdiA9IHN0YWNrRnJh bWUuYXJnc1sxXS5qc1ZhbHVlKCkpIHsKLSAgICAgICAgaWYgKCFzdGFja0ZyYW1lLmNhbGxGcmFt ZS0+Y29kZUJsb2NrKCktPmlzU3RyaWN0TW9kZSgpKQotICAgICAgICAgICAgYXNBcmd1bWVudHMo diktPnNldEFjdGl2YXRpb24oKnN0YWNrRnJhbWUuZ2xvYmFsRGF0YSwgYWN0aXZhdGlvbik7Ci0g ICAgfQorICAgIGFjdGl2YXRpb24tPnRlYXJPZmYoKnN0YWNrRnJhbWUuZ2xvYmFsRGF0YSk7Cisg ICAgaWYgKEpTVmFsdWUgdiA9IHN0YWNrRnJhbWUuYXJnc1sxXS5qc1ZhbHVlKCkpCisgICAgICAg IGFzQXJndW1lbnRzKHYpLT5kaWRUZWFyT2ZmQWN0aXZhdGlvbigqc3RhY2tGcmFtZS5nbG9iYWxE YXRhLCBhY3RpdmF0aW9uKTsKIH0KIAogREVGSU5FX1NUVUJfRlVOQ1RJT04odm9pZCwgb3BfdGVh cl9vZmZfYXJndW1lbnRzKQpAQCAtMjQxMSw3ICsyNDA5LDcgQEAgREVGSU5FX1NUVUJfRlVOQ1RJ T04odm9pZCwgb3BfdGVhcl9vZmZfYQogICAgIFNUVUJfSU5JVF9TVEFDS19GUkFNRShzdGFja0Zy YW1lKTsKIAogICAgIEFTU0VSVChzdGFja0ZyYW1lLmNhbGxGcmFtZS0+Y29kZUJsb2NrKCktPnVz ZXNBcmd1bWVudHMoKSAmJiAhc3RhY2tGcmFtZS5jYWxsRnJhbWUtPmNvZGVCbG9jaygpLT5uZWVk c0Z1bGxTY29wZUNoYWluKCkpOwotICAgIGFzQXJndW1lbnRzKHN0YWNrRnJhbWUuYXJnc1swXS5q c1ZhbHVlKCkpLT5jb3B5UmVnaXN0ZXJzKCpzdGFja0ZyYW1lLmdsb2JhbERhdGEpOworICAgIGFz QXJndW1lbnRzKHN0YWNrRnJhbWUuYXJnc1swXS5qc1ZhbHVlKCkpLT50ZWFyT2ZmKCpzdGFja0Zy YW1lLmdsb2JhbERhdGEpOwogfQogCiBERUZJTkVfU1RVQl9GVU5DVElPTih2b2lkLCBvcF9wcm9m aWxlX3dpbGxfY2FsbCkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FyZ3Vt ZW50cy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0FyZ3Vt ZW50cy5oCShyZXZpc2lvbiAxMDAxOTkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9Bcmd1bWVudHMuaAkod29ya2luZyBjb3B5KQpAQCAtNzAsMTAgKzcwLDEwIEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICAgICAgcmV0dXJuIGFyZ3VtZW50czsKICAgICAgICAgfQogICAgICAg ICAKLSAgICAgICAgc3RhdGljIEFyZ3VtZW50cyogY3JlYXRlQW5kQ29weVJlZ2lzdGVycyhKU0ds b2JhbERhdGEmIGdsb2JhbERhdGEsIENhbGxGcmFtZSogY2FsbEZyYW1lKQorICAgICAgICBzdGF0 aWMgQXJndW1lbnRzKiBjcmVhdGVBbmRUZWFyT2ZmKEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSwg Q2FsbEZyYW1lKiBjYWxsRnJhbWUpCiAgICAgICAgIHsKICAgICAgICAgICAgIEFyZ3VtZW50cyog YXJndW1lbnRzID0gbmV3IChhbGxvY2F0ZUNlbGw8QXJndW1lbnRzPihnbG9iYWxEYXRhLmhlYXAp KSBBcmd1bWVudHMoY2FsbEZyYW1lKTsKLSAgICAgICAgICAgIGFyZ3VtZW50cy0+ZmluaXNoQ3Jl YXRpb25BbmRDb3B5UmVnaXN0ZXJzKGNhbGxGcmFtZSk7CisgICAgICAgICAgICBhcmd1bWVudHMt PmZpbmlzaENyZWF0aW9uQW5kVGVhck9mZihjYWxsRnJhbWUpOwogICAgICAgICAgICAgcmV0dXJu IGFyZ3VtZW50czsKICAgICAgICAgfQogICAgICAgICAKQEAgLTExMSwxMSArMTExLDEyIEBAIG5h bWVzcGFjZSBKU0MgewogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICB2b2lkIGNvcHlUb1Jl Z2lzdGVycyhFeGVjU3RhdGUqIGV4ZWMsIFJlZ2lzdGVyKiBidWZmZXIsIHVpbnQzMl90IG1heFNp emUpOwotICAgICAgICB2b2lkIGNvcHlSZWdpc3RlcnMoSlNHbG9iYWxEYXRhJik7CisgICAgICAg IHZvaWQgdGVhck9mZihKU0dsb2JhbERhdGEmKTsKICAgICAgICAgYm9vbCBpc1Rvcm5PZmYoKSBj b25zdCB7IHJldHVybiBkLT5yZWdpc3RlckFycmF5OyB9Ci0gICAgICAgIHZvaWQgc2V0QWN0aXZh dGlvbihKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEsIEpTQWN0aXZhdGlvbiogYWN0aXZhdGlvbikK KyAgICAgICAgdm9pZCBkaWRUZWFyT2ZmQWN0aXZhdGlvbihKU0dsb2JhbERhdGEmIGdsb2JhbERh dGEsIEpTQWN0aXZhdGlvbiogYWN0aXZhdGlvbikKICAgICAgICAgewotICAgICAgICAgICAgQVNT RVJUKCFkLT5yZWdpc3RlckFycmF5KTsKKyAgICAgICAgICAgIGlmIChpc1Rvcm5PZmYoKSkKKyAg ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICBkLT5hY3RpdmF0aW9uLnNldChnbG9i YWxEYXRhLCB0aGlzLCBhY3RpdmF0aW9uKTsKICAgICAgICAgICAgIGQtPnJlZ2lzdGVycyA9ICZh Y3RpdmF0aW9uLT5yZWdpc3RlckF0KDApOwogICAgICAgICB9CkBAIC0xMjgsOSArMTI5LDkgQEAg bmFtZXNwYWNlIEpTQyB7CiAgICAgcHJvdGVjdGVkOgogICAgICAgICBzdGF0aWMgY29uc3QgdW5z aWduZWQgU3RydWN0dXJlRmxhZ3MgPSBPdmVycmlkZXNHZXRPd25Qcm9wZXJ0eVNsb3QgfCBPdmVy cmlkZXNWaXNpdENoaWxkcmVuIHwgT3ZlcnJpZGVzR2V0UHJvcGVydHlOYW1lcyB8IEpTT2JqZWN0 OjpTdHJ1Y3R1cmVGbGFnczsKIAotICAgICAgICB2b2lkIGZpbmlzaENyZWF0aW9uQnV0RG9udENv cHlSZWdpc3RlcnMoQ2FsbEZyYW1lKik7CisgICAgICAgIHZvaWQgZmluaXNoQ3JlYXRpb25CdXRE b250VGVhck9mZihDYWxsRnJhbWUqKTsKICAgICAgICAgdm9pZCBmaW5pc2hDcmVhdGlvbihDYWxs RnJhbWUqKTsKLSAgICAgICAgdm9pZCBmaW5pc2hDcmVhdGlvbkFuZENvcHlSZWdpc3RlcnMoQ2Fs bEZyYW1lKik7CisgICAgICAgIHZvaWQgZmluaXNoQ3JlYXRpb25BbmRUZWFyT2ZmKENhbGxGcmFt ZSopOwogICAgICAgICB2b2lkIGZpbmlzaENyZWF0aW9uKENhbGxGcmFtZSosIE5vUGFyYW1ldGVy c1R5cGUpOwogCiAgICAgcHJpdmF0ZToKQEAgLTE5MCw3ICsxOTEsNyBAQCBuYW1lc3BhY2UgSlND IHsKICAgICB7CiAgICAgfQogICAgIAotICAgIGlubGluZSB2b2lkIEFyZ3VtZW50czo6ZmluaXNo Q3JlYXRpb25CdXREb250Q29weVJlZ2lzdGVycyhDYWxsRnJhbWUqIGNhbGxGcmFtZSkKKyAgICBp bmxpbmUgdm9pZCBBcmd1bWVudHM6OmZpbmlzaENyZWF0aW9uQnV0RG9udFRlYXJPZmYoQ2FsbEZy YW1lKiBjYWxsRnJhbWUpCiAgICAgewogICAgICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbihjYWxs RnJhbWUtPmdsb2JhbERhdGEoKSk7CiAgICAgICAgIEFTU0VSVChpbmhlcml0cygmc19pbmZvKSk7 CkBAIC0yMzMsMTIgKzIzNCwxMiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICBpbmxpbmUgdm9pZCBB cmd1bWVudHM6OmZpbmlzaENyZWF0aW9uKENhbGxGcmFtZSogY2FsbEZyYW1lKQogICAgIHsKICAg ICAgICAgQVNTRVJUKCFjYWxsRnJhbWUtPmlzSW5saW5lQ2FsbEZyYW1lKCkpOwotICAgICAgICBm aW5pc2hDcmVhdGlvbkJ1dERvbnRDb3B5UmVnaXN0ZXJzKGNhbGxGcmFtZSk7CisgICAgICAgIGZp bmlzaENyZWF0aW9uQnV0RG9udFRlYXJPZmYoY2FsbEZyYW1lKTsKICAgICAgICAgaWYgKGQtPmlz U3RyaWN0TW9kZSkKLSAgICAgICAgICAgIGNvcHlSZWdpc3RlcnMoY2FsbEZyYW1lLT5nbG9iYWxE YXRhKCkpOworICAgICAgICAgICAgdGVhck9mZihjYWxsRnJhbWUtPmdsb2JhbERhdGEoKSk7CiAg ICAgfQogCi0gICAgaW5saW5lIHZvaWQgQXJndW1lbnRzOjpmaW5pc2hDcmVhdGlvbkFuZENvcHlS ZWdpc3RlcnMoQ2FsbEZyYW1lKiBjYWxsRnJhbWUpCisgICAgaW5saW5lIHZvaWQgQXJndW1lbnRz OjpmaW5pc2hDcmVhdGlvbkFuZFRlYXJPZmYoQ2FsbEZyYW1lKiBjYWxsRnJhbWUpCiAgICAgewog ICAgICAgICBCYXNlOjpmaW5pc2hDcmVhdGlvbihjYWxsRnJhbWUtPmdsb2JhbERhdGEoKSk7CiAg ICAgICAgIEFTU0VSVChpbmhlcml0cygmc19pbmZvKSk7CkBAIC0zNTYsMTAgKzM1NywxMCBAQCBu YW1lc3BhY2UgSlNDIHsKICAgICAgICAgZC0+b3ZlcnJvZGVDYWxsZXIgPSBmYWxzZTsKICAgICAg ICAgZC0+aXNTdHJpY3RNb2RlID0gY2FsbEZyYW1lLT5jb2RlQmxvY2soKS0+aXNTdHJpY3RNb2Rl KCk7CiAgICAgICAgIGlmIChkLT5pc1N0cmljdE1vZGUpCi0gICAgICAgICAgICBjb3B5UmVnaXN0 ZXJzKGNhbGxGcmFtZS0+Z2xvYmFsRGF0YSgpKTsKKyAgICAgICAgICAgIHRlYXJPZmYoY2FsbEZy YW1lLT5nbG9iYWxEYXRhKCkpOwogICAgIH0KIAotICAgIGlubGluZSB2b2lkIEFyZ3VtZW50czo6 Y29weVJlZ2lzdGVycyhKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEpCisgICAgaW5saW5lIHZvaWQg QXJndW1lbnRzOjp0ZWFyT2ZmKEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSkKICAgICB7CiAgICAg ICAgIEFTU0VSVCghaXNUb3JuT2ZmKCkpOwogCkBAIC0zNzYsMjQgKzM3Nyw2IEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICBkLT5yZWdpc3RlckFycmF5ID0gcmVnaXN0ZXJBcnJheS5yZWxlYXNl KCk7CiAgICAgfQogCi0gICAgLy8gVGhpcyBKU0FjdGl2YXRpb24gZnVuY3Rpb24gaXMgZGVmaW5l ZCBoZXJlIHNvIGl0IGNhbiBnZXQgYXQgQXJndW1lbnRzOjpzZXRSZWdpc3RlcnMuCi0gICAgaW5s aW5lIHZvaWQgSlNBY3RpdmF0aW9uOjpjb3B5UmVnaXN0ZXJzKEpTR2xvYmFsRGF0YSYgZ2xvYmFs RGF0YSkKLSAgICB7Ci0gICAgICAgIEFTU0VSVCghbV9yZWdpc3RlckFycmF5KTsKLQotICAgICAg ICBzaXplX3QgbnVtTG9jYWxzID0gbV9udW1DYXB0dXJlZFZhcnMgKyBtX251bVBhcmFtZXRlcnNN aW51c1RoaXM7Ci0KLSAgICAgICAgaWYgKCFudW1Mb2NhbHMpCi0gICAgICAgICAgICByZXR1cm47 Ci0KLSAgICAgICAgaW50IHJlZ2lzdGVyT2Zmc2V0ID0gbV9udW1QYXJhbWV0ZXJzTWludXNUaGlz ICsgUmVnaXN0ZXJGaWxlOjpDYWxsRnJhbWVIZWFkZXJTaXplOwotICAgICAgICBzaXplX3QgcmVn aXN0ZXJBcnJheVNpemUgPSBudW1Mb2NhbHMgKyBSZWdpc3RlckZpbGU6OkNhbGxGcmFtZUhlYWRl clNpemU7Ci0KLSAgICAgICAgT3duQXJyYXlQdHI8V3JpdGVCYXJyaWVyPFVua25vd24+ID4gcmVn aXN0ZXJBcnJheSA9IGNvcHlSZWdpc3RlckFycmF5KGdsb2JhbERhdGEsIG1fcmVnaXN0ZXJzIC0g cmVnaXN0ZXJPZmZzZXQsIHJlZ2lzdGVyQXJyYXlTaXplLCBtX251bVBhcmFtZXRlcnNNaW51c1Ro aXMgKyAxKTsKLSAgICAgICAgV3JpdGVCYXJyaWVyPFVua25vd24+KiByZWdpc3RlcnMgPSByZWdp c3RlckFycmF5LmdldCgpICsgcmVnaXN0ZXJPZmZzZXQ7Ci0gICAgICAgIHNldFJlZ2lzdGVycyhy ZWdpc3RlcnMsIHJlZ2lzdGVyQXJyYXkucmVsZWFzZSgpKTsKLSAgICB9Ci0KIH0gLy8gbmFtZXNw YWNlIEpTQwogCiAjZW5kaWYgLy8gQXJndW1lbnRzX2gKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTQWN0aXZhdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTQWN0aXZhdGlvbi5oCShyZXZpc2lvbiAxMDAxOTkpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0FjdGl2YXRpb24uaAkod29ya2luZyBjb3B5KQpA QCAtNjksNyArNjksNyBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAgICAgICBzdGF0aWMgSlNPYmpl Y3QqIHRvVGhpc09iamVjdChKU0NlbGwqLCBFeGVjU3RhdGUqKTsKIAotICAgICAgICB2b2lkIGNv cHlSZWdpc3RlcnMoSlNHbG9iYWxEYXRhJik7CisgICAgICAgIHZvaWQgdGVhck9mZihKU0dsb2Jh bERhdGEmKTsKICAgICAgICAgCiAgICAgICAgIHN0YXRpYyBjb25zdCBDbGFzc0luZm8gc19pbmZv OwogCkBAIC0xMTQsNiArMTE0LDIzIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgfQogCisgICAgaW5saW5lIHZvaWQgSlNBY3RpdmF0aW9uOjp0ZWFyT2ZmKEpT R2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSkKKyAgICB7CisgICAgICAgIEFTU0VSVCghbV9yZWdpc3Rl ckFycmF5KTsKKworICAgICAgICBzaXplX3QgbnVtTG9jYWxzID0gbV9udW1DYXB0dXJlZFZhcnMg KyBtX251bVBhcmFtZXRlcnNNaW51c1RoaXM7CisKKyAgICAgICAgaWYgKCFudW1Mb2NhbHMpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaW50IHJlZ2lzdGVyT2Zmc2V0ID0gbV9udW1Q YXJhbWV0ZXJzTWludXNUaGlzICsgUmVnaXN0ZXJGaWxlOjpDYWxsRnJhbWVIZWFkZXJTaXplOwor ICAgICAgICBzaXplX3QgcmVnaXN0ZXJBcnJheVNpemUgPSBudW1Mb2NhbHMgKyBSZWdpc3RlckZp bGU6OkNhbGxGcmFtZUhlYWRlclNpemU7CisKKyAgICAgICAgT3duQXJyYXlQdHI8V3JpdGVCYXJy aWVyPFVua25vd24+ID4gcmVnaXN0ZXJBcnJheSA9IGNvcHlSZWdpc3RlckFycmF5KGdsb2JhbERh dGEsIG1fcmVnaXN0ZXJzIC0gcmVnaXN0ZXJPZmZzZXQsIHJlZ2lzdGVyQXJyYXlTaXplLCBtX251 bVBhcmFtZXRlcnNNaW51c1RoaXMgKyAxKTsKKyAgICAgICAgV3JpdGVCYXJyaWVyPFVua25vd24+ KiByZWdpc3RlcnMgPSByZWdpc3RlckFycmF5LmdldCgpICsgcmVnaXN0ZXJPZmZzZXQ7CisgICAg ICAgIHNldFJlZ2lzdGVycyhyZWdpc3RlcnMsIHJlZ2lzdGVyQXJyYXkucmVsZWFzZSgpKTsKKyAg ICB9CisKIH0gLy8gbmFtZXNwYWNlIEpTQwogCiAjZW5kaWYgLy8gSlNBY3RpdmF0aW9uX2gK