41729 2010-07-06 18:40:02 -0700 "In cell" does not correctly handle <td><tr> or <td><td> 2010-07-06 18:49:38 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 eric eric abarth oldest_to_newest 247263 0 eric 2010-07-06 18:40:02 -0700 "In cell" does not correctly handle <td><tr> or <td><td> 247264 1 60671 eric 2010-07-06 18:43:08 -0700 Created attachment 60671 Patch 247265 2 60671 abarth 2010-07-06 18:46:36 -0700 Comment on attachment 60671 Patch ok 247266 3 eric 2010-07-06 18:49:38 -0700 Committed r62613: <http://trac.webkit.org/changeset/62613> 60671 2010-07-06 18:43:08 -0700 2010-07-06 18:46:35 -0700 Patch bug-41729-20100706184307.patch text/plain 20156 eric ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2ZmIyZWU3MmU2ZmY4NjdkZGQyYWVmMDhlZTJiNjcxNmRkODUwNjlmLi5kMGYzNTYx ZmJjNmU2ODhkY2QyZGU1YmE3ZDczZDYyZjkwNWZiYTE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMDctMDYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICJJbiBjZWxsIiBkb2VzIG5vdCBj b3JyZWN0bHkgaGFuZGxlIDx0ZD48dHI+IG9yIDx0ZD48dGQ+CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTcyOQorCisgICAgICAgICogaHRtbDVsaWIv cmVzb3VyY2VzL3RhYmxlczAxLmRhdDoKKyAgICAgICAgIC0gQWRkZWQgYSBjYXNlIGZvciA8dGQ+ PHRyPiBzaW5jZSBpdCB3YXMgbWlzc2luZyBmcm9tIHRoZSByZXN0IG9mIHRoZSBzdWl0ZS4KKyAg ICAgICAgKiBodG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0OgorICAgICAgICAqIGh0 bWw1bGliL3J1bm5lci1leHBlY3RlZC50eHQ6CisKIDIwMTAtMDctMDYgIFZpdGFseSBSZXBlc2hr byAgPHZpdGFseXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9odG1sNWxpYi9yZXNvdXJjZXMvdGFibGVzMDEuZGF0IGIvTGF5b3V0 VGVzdHMvaHRtbDVsaWIvcmVzb3VyY2VzL3RhYmxlczAxLmRhdAppbmRleCA5Mjc1YWQzMzNiODU3 OTExMTA4OTMzZDA2MjdmYTE1Njc5ZGNmY2YwLi44YzU2NTJlMDNjMTA0ODU4MWVlYjkxMmM5ZjNk YzU2MDJmYzFiNmUzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odG1sNWxpYi9yZXNvdXJjZXMv dGFibGVzMDEuZGF0CisrKyBiL0xheW91dFRlc3RzL2h0bWw1bGliL3Jlc291cmNlcy90YWJsZXMw MS5kYXQKQEAgLTE2OCwzICsxNjgsMTYgQEAKIHwgICAgICAgICA8dHI+CiB8ICAgICAgICAgICA8 dGQ+CiB8ICAgICAgICAgICAgICJmb28iCisKKyNkYXRhCis8dGFibGU+PHRkPjx0cj4KKyNlcnJv cnMKKyNkb2N1bWVudAorfCA8aHRtbD4KK3wgICA8aGVhZD4KK3wgICA8Ym9keT4KK3wgICAgIDx0 YWJsZT4KK3wgICAgICAgPHRib2R5PgorfCAgICAgICAgIDx0cj4KK3wgICAgICAgICAgIDx0ZD4K K3wgICAgICAgICA8dHI+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXIt ZXhwZWN0ZWQtaHRtbDUudHh0IGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVk LWh0bWw1LnR4dAppbmRleCA2NDUxMGI5MjJlZjdhZmU4MDMzYzU2YjZjNTE0NWU0MjczYWVjZjRk Li5mNzJmYTY1ZmQyM2FiODg0Nzc1NmZlZTNiMWRkYWVhZDc3OTg0NzljIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQtaHRtbDUudHh0CisrKyBiL0xheW91 dFRlc3RzL2h0bWw1bGliL3J1bm5lci1leHBlY3RlZC1odG1sNS50eHQKQEAgLTExLDExICsxMSw4 IEBAIHJlc291cmNlcy90ZXN0czEuZGF0OgogNzgKIDc5CiA4MAotODYKIDkwCiAxMDMKLTEwOQot MTEwCiAxMTIKIAogVGVzdCAzMCBvZiAxMTMgaW4gcmVzb3VyY2VzL3Rlc3RzMS5kYXQgZmFpbGVk LiBJbnB1dDoKQEAgLTI1NSwzNCArMjUyLDYgQEAgRXhwZWN0ZWQ6CiB8ICAgICAgIGhyZWY9ImJs YWgiCiB8ICAgICAgICJhb2UiCiAKLVRlc3QgODYgb2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEu ZGF0IGZhaWxlZC4gSW5wdXQ6Ci08dGFibGU+PHRyPjx0cj48dGQ+PHRkPjxzcGFuPjx0aD48c3Bh bj5YPC90YWJsZT4KLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAg ICA8dGFibGU+Ci18ICAgICAgIDx0Ym9keT4KLXwgICAgICAgICA8dHI+Ci18ICAgICAgICAgICA8 dGQ+Ci18ICAgICAgICAgICAgIDxzcGFuPgotfCAgICAgICAgICAgICAgIDxzcGFuPgotfCAgICAg ICAgICAgICAgICAgIlgiCi1FeHBlY3RlZDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJv ZHk+Ci18ICAgICA8dGFibGU+Ci18ICAgICAgIDx0Ym9keT4KLXwgICAgICAgICA8dHI+Ci18ICAg ICAgICAgPHRyPgotfCAgICAgICAgICAgPHRkPgotfCAgICAgICAgICAgPHRkPgotfCAgICAgICAg ICAgICA8c3Bhbj4KLXwgICAgICAgICAgIDx0aD4KLXwgICAgICAgICAgICAgPHNwYW4+Ci18ICAg ICAgICAgICAgICAgIlgiCi0KIFRlc3QgOTAgb2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0 IGZhaWxlZC4gSW5wdXQ6CiA8YT48dGFibGU+PGE+PC90YWJsZT48cD48YT48ZGl2PjxhPgogR290 OgpAQCAtMzM5LDc3ICszMDgsNiBAQCBFeHBlY3RlZDoKIHwgICAgICAgICAgICAgICA8YT4KIHwg ICAgIDxhPgogCi1UZXN0IDEwOSBvZiAxMTMgaW4gcmVzb3VyY2VzL3Rlc3RzMS5kYXQgZmFpbGVk LiBJbnB1dDoKLTx0YWJsZT48Y29sPjx0Ym9keT48Y29sPjx0cj48Y29sPjx0ZD48Y29sPjwvdGFi bGU+PGNvbD4KLUdvdDoKLXwgPGh0bWw+Ci18ICAgPGhlYWQ+Ci18ICAgPGJvZHk+Ci18ICAgICA8 dGFibGU+Ci18ICAgICAgIDxjb2xncm91cD4KLXwgICAgICAgICA8Y29sPgotfCAgICAgICA8dGJv ZHk+Ci18ICAgICAgIDxjb2xncm91cD4KLXwgICAgICAgICA8Y29sPgotfCAgICAgICA8dGJvZHk+ Ci18ICAgICAgICAgPHRyPgotfCAgICAgICA8Y29sZ3JvdXA+Ci18ICAgICAgICAgPGNvbD4KLXwg ICAgICAgPHRib2R5PgotfCAgICAgICAgIDx0cj4KLXwgICAgICAgICAgIDx0ZD4KLUV4cGVjdGVk OgotfCA8aHRtbD4KLXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDx0YWJsZT4KLXwgICAg ICAgPGNvbGdyb3VwPgotfCAgICAgICAgIDxjb2w+Ci18ICAgICAgIDx0Ym9keT4KLXwgICAgICAg PGNvbGdyb3VwPgotfCAgICAgICAgIDxjb2w+Ci18ICAgICAgIDx0Ym9keT4KLXwgICAgICAgICA8 dHI+Ci18ICAgICAgIDxjb2xncm91cD4KLXwgICAgICAgICA8Y29sPgotfCAgICAgICA8dGJvZHk+ Ci18ICAgICAgICAgPHRyPgotfCAgICAgICAgICAgPHRkPgotfCAgICAgICA8Y29sZ3JvdXA+Ci18 ICAgICAgICAgPGNvbD4KLQotVGVzdCAxMTAgb2YgMTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0 IGZhaWxlZC4gSW5wdXQ6Ci08dGFibGU+PGNvbGdyb3VwPjx0Ym9keT48Y29sZ3JvdXA+PHRyPjxj b2xncm91cD48dGQ+PGNvbGdyb3VwPjwvdGFibGU+PGNvbGdyb3VwPgotR290OgotfCA8aHRtbD4K LXwgICA8aGVhZD4KLXwgICA8Ym9keT4KLXwgICAgIDx0YWJsZT4KLXwgICAgICAgPGNvbGdyb3Vw PgotfCAgICAgICA8dGJvZHk+Ci18ICAgICAgIDxjb2xncm91cD4KLXwgICAgICAgPHRib2R5Pgot fCAgICAgICAgIDx0cj4KLXwgICAgICAgPGNvbGdyb3VwPgotfCAgICAgICA8dGJvZHk+Ci18ICAg ICAgICAgPHRyPgotfCAgICAgICAgICAgPHRkPgotRXhwZWN0ZWQ6Ci18IDxodG1sPgotfCAgIDxo ZWFkPgotfCAgIDxib2R5PgotfCAgICAgPHRhYmxlPgotfCAgICAgICA8Y29sZ3JvdXA+Ci18ICAg ICAgIDx0Ym9keT4KLXwgICAgICAgPGNvbGdyb3VwPgotfCAgICAgICA8dGJvZHk+Ci18ICAgICAg ICAgPHRyPgotfCAgICAgICA8Y29sZ3JvdXA+Ci18ICAgICAgIDx0Ym9keT4KLXwgICAgICAgICA8 dHI+Ci18ICAgICAgICAgICA8dGQ+Ci18ICAgICAgIDxjb2xncm91cD4KLQogVGVzdCAxMTIgb2Yg MTEzIGluIHJlc291cmNlcy90ZXN0czEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8dGFibGU+PHRyPjwv c3Ryb25nPjwvYj48L2VtPjwvaT48L3U+PC9zdHJpa2U+PC9zPjwvYmxpbms+PC90dD48L3ByZT48 L2JpZz48L3NtYWxsPjwvZm9udD48L3NlbGVjdD48L2gxPjwvaDI+PC9oMz48L2g0PjwvaDU+PC9o Nj48L2JvZHk+PC9icj48L2E+PC9pbWc+PC90aXRsZT48L3NwYW4+PC9zdHlsZT48L3NjcmlwdD48 L3RhYmxlPjwvdGg+PC90ZD48L3RyPjwvZnJhbWU+PC9hcmVhPjwvbGluaz48L3BhcmFtPjwvaHI+ PC9pbnB1dD48L2NvbD48L2Jhc2U+PC9tZXRhPjwvYmFzZWZvbnQ+PC9iZ3NvdW5kPjwvZW1iZWQ+ PC9zcGFjZXI+PC9wPjwvZGQ+PC9kdD48L2NhcHRpb24+PC9jb2xncm91cD48L3Rib2R5PjwvdGZv b3Q+PC90aGVhZD48L2FkZHJlc3M+PC9ibG9ja3F1b3RlPjwvY2VudGVyPjwvZGlyPjwvZGl2Pjwv ZGw+PC9maWVsZHNldD48L2xpc3Rpbmc+PC9tZW51Pjwvb2w+PC91bD48L2xpPjwvbm9icj48L3di cj48L2Zvcm0+PC9idXR0b24+PC9tYXJxdWVlPjwvb2JqZWN0PjwvaHRtbD48L2ZyYW1lc2V0Pjwv aGVhZD48L2lmcmFtZT48L2ltYWdlPjwvaXNpbmRleD48L25vZW1iZWQ+PC9ub2ZyYW1lcz48L25v c2NyaXB0Pjwvb3B0Z3JvdXA+PC9vcHRpb24+PC9wbGFpbnRleHQ+PC90ZXh0YXJlYT4KIEdvdDoK QEAgLTk0OSw2ICs4NDcsNyBAQCBHb3Q6CiB8ICAgICA8dGFibGU+CiB8ICAgICAgIDx0Ym9keT4K IHwgICAgICAgICA8dHI+Cit8ICAgICAgICAgICA8ZGl2PgogRXhwZWN0ZWQ6CiB8IDxodG1sPgog fCAgIDxoZWFkPgpAQCAtOTY3LDYgKzg2Niw3IEBAIEdvdDoKIHwgICAgIDx0YWJsZT4KIHwgICAg ICAgPHRib2R5PgogfCAgICAgICAgIDx0cj4KK3wgICAgICAgICAgIDxkaXY+CiB8ICAgICAgICAg ICA8dGQ+CiBFeHBlY3RlZDoKIHwgPGh0bWw+CkBAIC0xNjcyLDcgKzE1NzIsMTEgQEAgR290Ogog fCAgICAgPHRhYmxlPgogfCAgICAgICA8dGJvZHk+CiB8ICAgICAgICAgPHRyPgotfCAgICAgICAg ICAgImZvb2JhciIKK3wgICAgICAgICAgIDxtYXRoPgorfCAgICAgICAgICAgICA8bWk+Cit8ICAg ICAgICAgICAgICAgImZvbyIKK3wgICAgICAgICAgICAgICA8bWk+Cit8ICAgICAgICAgICAgICAg ICAiYmFyIgogRXhwZWN0ZWQ6CiB8IDwhRE9DVFlQRSBodG1sPgogfCA8aHRtbD4KQEAgLTIyMTEs NyArMjExNSwxMSBAQCBHb3Q6CiB8ICAgICA8dGFibGU+CiB8ICAgICAgIDx0Ym9keT4KIHwgICAg ICAgICA8dHI+Ci18ICAgICAgICAgICAiZm9vYmFyIgorfCAgICAgICAgICAgPHN2Zz4KK3wgICAg ICAgICAgICAgPGc+Cit8ICAgICAgICAgICAgICAgImZvbyIKK3wgICAgICAgICAgICAgICA8Zz4K K3wgICAgICAgICAgICAgICAgICJiYXIiCiBFeHBlY3RlZDoKIHwgPCFET0NUWVBFIGh0bWw+CiB8 IDxodG1sPgpAQCAtNDAxOSw3ICszOTI3LDcgQEAgcmVzb3VyY2VzL3RhYmxlczAxLmRhdDoKIDkK IDEwCiAKLVRlc3QgNCBvZiAxNCBpbiByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5w dXQ6CitUZXN0IDQgb2YgMTUgaW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElucHV0 OgogPHRhYmxlPjxjb2xncm91cD48L2h0bWw+Zm9vCiBHb3Q6CiB8IDxodG1sPgpAQCAtNDAzNiw3 ICszOTQ0LDcgQEAgRXhwZWN0ZWQ6CiB8ICAgICA8dGFibGU+CiB8ICAgICAgIDxjb2xncm91cD4K IAotVGVzdCA3IG9mIDE0IGluIHJlc291cmNlcy90YWJsZXMwMS5kYXQgZmFpbGVkLiBJbnB1dDoK K1Rlc3QgNyBvZiAxNSBpbiByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CiA8 dGFibGU+PHNlbGVjdD48b3B0aW9uPjM8L3NlbGVjdD48L3RhYmxlPgogR290OgogfCA8aHRtbD4K QEAgLTQwNTUsNyArMzk2Myw3IEBAIEV4cGVjdGVkOgogfCAgICAgICAgICIzIgogfCAgICAgPHRh YmxlPgogCi1UZXN0IDggb2YgMTQgaW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElu cHV0OgorVGVzdCA4IG9mIDE1IGluIHJlc291cmNlcy90YWJsZXMwMS5kYXQgZmFpbGVkLiBJbnB1 dDoKIDx0YWJsZT48c2VsZWN0Pjx0YWJsZT48L3RhYmxlPjwvc2VsZWN0PjwvdGFibGU+CiBHb3Q6 CiB8IDxodG1sPgpAQCAtNDA3MSw3ICszOTc5LDcgQEAgRXhwZWN0ZWQ6CiB8ICAgICA8dGFibGU+ CiB8ICAgICA8dGFibGU+CiAKLVRlc3QgOSBvZiAxNCBpbiByZXNvdXJjZXMvdGFibGVzMDEuZGF0 IGZhaWxlZC4gSW5wdXQ6CitUZXN0IDkgb2YgMTUgaW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBm YWlsZWQuIElucHV0OgogPHRhYmxlPjxzZWxlY3Q+PC90YWJsZT4KIEdvdDoKIHwgPGh0bWw+CkBA IC00MDg2LDcgKzM5OTQsNyBAQCBFeHBlY3RlZDoKIHwgICAgIDxzZWxlY3Q+CiB8ICAgICA8dGFi bGU+CiAKLVRlc3QgMTAgb2YgMTQgaW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWlsZWQuIElu cHV0OgorVGVzdCAxMCBvZiAxNSBpbiByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4gSW5w dXQ6CiA8dGFibGU+PHNlbGVjdD48b3B0aW9uPkE8dHI+PHRkPkI8L3RkPjwvdHI+PC90YWJsZT4K IEdvdDoKIHwgPGh0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odG1sNWxpYi9ydW5uZXIt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHRtbDVsaWIvcnVubmVyLWV4cGVjdGVkLnR4dApp bmRleCAxYWE5NjQ3YjU4ZmJiYjM1MzQ5Yzg5YmY2NGNlZTBlODM1OTYxOTJiLi40M2M2M2Q3Y2I0 ZTA0ZmE4ZDk0MDU3NTllYjg0NTdkNGU0Yzg1Y2M4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9o dG1sNWxpYi9ydW5uZXItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2h0bWw1bGliL3J1 bm5lci1leHBlY3RlZC50eHQKQEAgLTUxMzUsNyArNTEzNSw3IEBAIHJlc291cmNlcy90YWJsZXMw MS5kYXQ6CiA4CiA5CiAKLVRlc3QgMyBvZiAxNCBpbiByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZh aWxlZC4gSW5wdXQ6CitUZXN0IDMgb2YgMTUgaW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBmYWls ZWQuIElucHV0OgogPHRhYmxlPjxjb2wgZm9vPSdiYXInPgogR290OgogfCA8aHRtbD4KQEAgLTUx NTMsNyArNTE1Myw3IEBAIEV4cGVjdGVkOgogfCAgICAgICAgIDxjb2w+CiB8ICAgICAgICAgICBm b289ImJhciIKIAotVGVzdCA3IG9mIDE0IGluIHJlc291cmNlcy90YWJsZXMwMS5kYXQgZmFpbGVk LiBJbnB1dDoKK1Rlc3QgNyBvZiAxNSBpbiByZXNvdXJjZXMvdGFibGVzMDEuZGF0IGZhaWxlZC4g SW5wdXQ6CiA8dGFibGU+PHNlbGVjdD48b3B0aW9uPjM8L3NlbGVjdD48L3RhYmxlPgogR290Ogog fCA8aHRtbD4KQEAgLTUxNzMsNyArNTE3Myw3IEBAIEV4cGVjdGVkOgogfCAgICAgICAgICIzIgog fCAgICAgPHRhYmxlPgogCi1UZXN0IDggb2YgMTQgaW4gcmVzb3VyY2VzL3RhYmxlczAxLmRhdCBm YWlsZWQuIElucHV0OgorVGVzdCA4IG9mIDE1IGluIHJlc291cmNlcy90YWJsZXMwMS5kYXQgZmFp bGVkLiBJbnB1dDoKIDx0YWJsZT48c2VsZWN0Pjx0YWJsZT48L3RhYmxlPjwvc2VsZWN0PjwvdGFi bGU+CiBHb3Q6CiB8IDxodG1sPgpAQCAtNTE5MSw3ICs1MTkxLDcgQEAgRXhwZWN0ZWQ6CiB8ICAg ICA8dGFibGU+CiB8ICAgICA8dGFibGU+CiAKLVRlc3QgOSBvZiAxNCBpbiByZXNvdXJjZXMvdGFi bGVzMDEuZGF0IGZhaWxlZC4gSW5wdXQ6CitUZXN0IDkgb2YgMTUgaW4gcmVzb3VyY2VzL3RhYmxl czAxLmRhdCBmYWlsZWQuIElucHV0OgogPHRhYmxlPjxzZWxlY3Q+PC90YWJsZT4KIEdvdDoKIHwg PGh0bWw+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGU4YzJhN2RmMWE3ZDVlOGU1NGI1ODNlNjFmYzFkYzQ3ZTQ5NWQ5MWYuLjI2NmQ0N2Mx NzA1ODg3NTYyOTllMzZmMjI3MmUxYTJiNTJiZGNlMGQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMDct MDYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICJJbiBjZWxsIiBkb2VzIG5vdCBjb3JyZWN0bHkg aGFuZGxlIDx0ZD48dHI+IG9yIDx0ZD48dGQ+CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00MTcyOQorCisgICAgICAgIFRoaXMgY2hhbmdlIGlzIG1vc3Rs eSBjbGVhbnVwIHRvIHRyeSBhbmQgcHJldmVudCBmb3JnZXR0aW5nCisgICAgICAgIHRhZyBuYW1l IGNoZWNrcyBpbiB0aGUgZnV0dXJlIGJ5IHVzaW5nIGlubGluZXMgdG8gcmVkdWNlCisgICAgICAg IGNvcHkvcGFzdGUgY29kZS4KKworICAgICAgICAzIGxpdHRsZSBidWdzIGluIEluQ2VsbE1vZGU6 CisgICAgICAgICAtIE1pc3NpbmcgdHJUYWcgZnJvbSB0aGUgbG9uZyBvciBzdGF0ZW1lbnQgKHJl YXNvbiBmb3IgdGhlIGNsZWFudXApCisgICAgICAgICAtIFVzZWQgfHwgaW5zdGVhZCBvZiAmJgor ICAgICAgICAgLSBGb3Jnb3QgdG8gcmVwcm9jZXNzIHRoZSB0YWcgYWZ0ZXIgY2xvc2VUaGVDZWxs KCkKKworICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KToKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9ySW5UYWJsZSk6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWdGb3JJblRhYmxlKToK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZyk6CisKIDIw MTAtMDctMDYgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJv cmEuY28udWs+CiAKICAgICAgICAgVW5yZXZpZXdlZC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRt bC9IVE1MVHJlZUJ1aWxkZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAK aW5kZXggMTNkYjQ2ZmRmNDgyNDU0NTFlYmJhNmFhMTBhM2U1NzJjZjg0NmZiNi4uMmU2YTA5ZTVk MDllYWNkODFiYzhiYjBmZWE3NTYyZGFkZjc2NzdlOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1s L0hUTUxUcmVlQnVpbGRlci5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5j cHAKQEAgLTgxLDYgKzgxLDE4IEBAIGJvb2wgaXNOdW1iZXJlZEhlYWRlclRhZyhjb25zdCBBdG9t aWNTdHJpbmcmIHRhZ05hbWUpCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gaDZUYWc7CiB9CiAKK2Jv b2wgaXNDYXB0aW9uQ29sT3JDb2xncm91cFRhZyhjb25zdCBBdG9taWNTdHJpbmcmIHRhZ05hbWUp Cit7CisgICAgcmV0dXJuIHRhZ05hbWUgPT0gY2FwdGlvblRhZworICAgICAgICB8fCB0YWdOYW1l ID09IGNvbFRhZworICAgICAgICB8fCB0YWdOYW1lID09IGNvbGdyb3VwVGFnOworfQorCitib29s IGlzVGFibGVDZWxsQ29udGV4dFRhZyhjb25zdCBBdG9taWNTdHJpbmcmIHRhZ05hbWUpCit7Cisg ICAgcmV0dXJuIHRhZ05hbWUgPT0gdGhUYWcgfHwgdGFnTmFtZSA9PSB0ZFRhZzsKK30KKwogYm9v bCBpc1RhYmxlQm9keUNvbnRleHRUYWcoY29uc3QgQXRvbWljU3RyaW5nJiB0YWdOYW1lKQogewog ICAgIHJldHVybiB0YWdOYW1lID09IHRib2R5VGFnCkBAIC0xNjksOCArMTgxLDcgQEAgYm9vbCBp c1Njb3BpbmdUYWcoY29uc3QgQXRvbWljU3RyaW5nJiB0YWdOYW1lKQogICAgICAgICB8fCB0YWdO YW1lID09IG1hcnF1ZWVUYWcKICAgICAgICAgfHwgdGFnTmFtZSA9PSBvYmplY3RUYWcKICAgICAg ICAgfHwgdGFnTmFtZSA9PSB0YWJsZVRhZwotICAgICAgICB8fCB0YWdOYW1lID09IHRkVGFnCi0g ICAgICAgIHx8IHRhZ05hbWUgPT0gdGhUYWc7CisgICAgICAgIHx8IGlzVGFibGVDZWxsQ29udGV4 dFRhZyh0YWdOYW1lKTsKIH0KIAogYm9vbCBpc05vbkFuY2hvckZvcm1hdHRpbmdUYWcoY29uc3Qg QXRvbWljU3RyaW5nJiB0YWdOYW1lKQpAQCAtODA0LDcgKzgxNSwxMiBAQCB2b2lkIEhUTUxUcmVl QnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4p CiAgICAgICAgIC8vIFRoaXMgaXMgdGhlIFNWRyBmb3JlaWduIGNvbnRlbnQgYnJhbmNoIHBvaW50 LgogICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIH0KLSAgICBpZiAodG9rZW4ubmFtZSgp ID09IGNhcHRpb25UYWcgfHwgdG9rZW4ubmFtZSgpID09IGNvbFRhZyB8fCB0b2tlbi5uYW1lKCkg PT0gY29sZ3JvdXBUYWcgfHwgdG9rZW4ubmFtZSgpID09IGZyYW1lVGFnIHx8IHRva2VuLm5hbWUo KSA9PSBoZWFkVGFnIHx8IGlzVGFibGVCb2R5Q29udGV4dFRhZyh0b2tlbi5uYW1lKCkpIHx8IHRv a2VuLm5hbWUoKSA9PSB0ZFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdGhUYWcgfHwgdG9rZW4ubmFt ZSgpID09IHRyVGFnKSB7CisgICAgaWYgKGlzQ2FwdGlvbkNvbE9yQ29sZ3JvdXBUYWcodG9rZW4u bmFtZSgpKQorICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZnJhbWVUYWcKKyAgICAgICAgfHwg dG9rZW4ubmFtZSgpID09IGhlYWRUYWcKKyAgICAgICAgfHwgaXNUYWJsZUJvZHlDb250ZXh0VGFn KHRva2VuLm5hbWUoKSkKKyAgICAgICAgfHwgaXNUYWJsZUNlbGxDb250ZXh0VGFnKHRva2VuLm5h bWUoKSkKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHRyVGFnKSB7CiAgICAgICAgIHBhcnNl RXJyb3IodG9rZW4pOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtODY2LDcgKzg4Miw3IEBA IHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3JJblRhYmxlKEF0b21pY0hU TUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IEluVGFibGVCb2R5TW9k ZTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBpZiAodG9rZW4ubmFtZSgpID09IHRkVGFn IHx8IHRva2VuLm5hbWUoKSA9PSB0aFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdHJUYWcpIHsKKyAg ICBpZiAoaXNUYWJsZUNlbGxDb250ZXh0VGFnKHRva2VuLm5hbWUoKSkgfHwgdG9rZW4ubmFtZSgp ID09IHRyVGFnKSB7CiAgICAgICAgIHByb2Nlc3NGYWtlU3RhcnRUYWcodGJvZHlUYWcpOwogICAg ICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluVGFibGVCb2R5TW9kZSk7CiAgICAgICAg IHByb2Nlc3NTdGFydFRhZyh0b2tlbik7CkBAIC05NzQsNyArOTkwLDEwIEBAIHZvaWQgSFRNTFRy ZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBJbkNhcHRpb25Nb2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0 aW9uTW9kZSgpID09IEluQ2FwdGlvbk1vZGUpOwotICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09 IGNhcHRpb25UYWcgfHwgdG9rZW4ubmFtZSgpID09IGNvbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0g Y29sZ3JvdXBUYWcgfHwgaXNUYWJsZUJvZHlDb250ZXh0VGFnKHRva2VuLm5hbWUoKSkgfHwgdG9r ZW4ubmFtZSgpID09IHRkVGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0aFRhZyB8fCB0b2tlbi5uYW1l KCkgPT0gdHJUYWcpIHsKKyAgICAgICAgaWYgKGlzQ2FwdGlvbkNvbE9yQ29sZ3JvdXBUYWcodG9r ZW4ubmFtZSgpKQorICAgICAgICAgICAgfHwgaXNUYWJsZUJvZHlDb250ZXh0VGFnKHRva2VuLm5h bWUoKSkKKyAgICAgICAgICAgIHx8IGlzVGFibGVDZWxsQ29udGV4dFRhZyh0b2tlbi5uYW1lKCkp CisgICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gdHJUYWcpIHsKICAgICAgICAgICAgIHBh cnNlRXJyb3IodG9rZW4pOwogICAgICAgICAgICAgaWYgKCFwcm9jZXNzQ2FwdGlvbkVuZFRhZ0Zv ckluQ2FwdGlvbigpKSB7CiAgICAgICAgICAgICAgICAgQVNTRVJUKG1faXNQYXJzaW5nRnJhZ21l bnQpOwpAQCAtMTAwOSwxNCArMTAyOCwxNCBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vz c1N0YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBtX2luc2VydGlv bk1vZGUgPSBJblJvd01vZGU7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAg ICAgaWYgKHRva2VuLm5hbWUoKSA9PSB0aFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdGRUYWcpIHsK KyAgICAgICAgaWYgKGlzVGFibGVDZWxsQ29udGV4dFRhZyh0b2tlbi5uYW1lKCkpKSB7CiAgICAg ICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKICAgICAgICAgICAgIHByb2Nlc3NGYWtlU3RhcnRU YWcodHJUYWcpOwogICAgICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJblJvd01v ZGUpOwogICAgICAgICAgICAgcHJvY2Vzc1N0YXJ0VGFnKHRva2VuKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQotICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGNhcHRpb25UYWcg fHwgdG9rZW4ubmFtZSgpID09IGNvbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gY29sZ3JvdXBUYWcg fHwgaXNUYWJsZUJvZHlDb250ZXh0VGFnKHRva2VuLm5hbWUoKSkpIHsKKyAgICAgICAgaWYgKGlz Q2FwdGlvbkNvbE9yQ29sZ3JvdXBUYWcodG9rZW4ubmFtZSgpKSB8fCBpc1RhYmxlQm9keUNvbnRl eHRUYWcodG9rZW4ubmFtZSgpKSkgewogICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMgc2xv dy4KICAgICAgICAgICAgIGlmICghbV90cmVlLm9wZW5FbGVtZW50cygpLT5pblRhYmxlU2NvcGUo dGJvZHlUYWcubG9jYWxOYW1lKCkpICYmICFtX3RyZWUub3BlbkVsZW1lbnRzKCktPmluVGFibGVT Y29wZSh0aGVhZFRhZy5sb2NhbE5hbWUoKSkgJiYgIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5U YWJsZVNjb3BlKHRmb290VGFnLmxvY2FsTmFtZSgpKSkgewogICAgICAgICAgICAgICAgIEFTU0VS VChtX2lzUGFyc2luZ0ZyYWdtZW50KTsKQEAgLTEwMzMsMTMgKzEwNTIsMTYgQEAgdm9pZCBIVE1M VHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAg ICAgICBicmVhazsKICAgICBjYXNlIEluUm93TW9kZToKICAgICAgICAgQVNTRVJUKGluc2VydGlv bk1vZGUoKSA9PSBJblJvd01vZGUpOwotICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IHRoVGFn IHx8IHRva2VuLm5hbWUoKSA9PSB0ZFRhZykgeworICAgICAgICBpZiAoaXNUYWJsZUNlbGxDb250 ZXh0VGFnKHRva2VuLm5hbWUoKSkpIHsKICAgICAgICAgICAgIG1fdHJlZS5vcGVuRWxlbWVudHMo KS0+cG9wVW50aWxUYWJsZVJvd1Njb3BlTWFya2VyKCk7CiAgICAgICAgICAgICBtX3RyZWUuaW5z ZXJ0RWxlbWVudCh0b2tlbik7CiAgICAgICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBJbkNlbGxN b2RlOwogICAgICAgICAgICAgbV90cmVlLmFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpLT5hcHBl bmRNYXJrZXIoKTsKKyAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBpZiAo dG9rZW4ubmFtZSgpID09IGNhcHRpb25UYWcgfHwgdG9rZW4ubmFtZSgpID09IGNvbFRhZyB8fCB0 b2tlbi5uYW1lKCkgPT0gY29sZ3JvdXBUYWcgfHwgaXNUYWJsZUJvZHlDb250ZXh0VGFnKHRva2Vu Lm5hbWUoKSkpIHsKKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSB0clRhZworICAgICAgICAg ICAgfHwgaXNDYXB0aW9uQ29sT3JDb2xncm91cFRhZyh0b2tlbi5uYW1lKCkpCisgICAgICAgICAg ICB8fCBpc1RhYmxlQm9keUNvbnRleHRUYWcodG9rZW4ubmFtZSgpKSkgewogICAgICAgICAgICAg aWYgKCFwcm9jZXNzVHJFbmRUYWdGb3JJblJvdygpKSB7CiAgICAgICAgICAgICAgICAgQVNTRVJU KG1faXNQYXJzaW5nRnJhZ21lbnQpOwogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTEwNDgs MTcgKzEwNzAsMjIgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdG9t aWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICAgICAgcHJvY2Vzc1N0YXJ0VGFnKHRva2VuKTsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBub3RJbXBsZW1lbnRlZCgp OworICAgICAgICBwcm9jZXNzU3RhcnRUYWdGb3JJblRhYmxlKHRva2VuKTsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBJbkNlbGxNb2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9uTW9kZSgp ID09IEluQ2VsbE1vZGUpOwotICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGNhcHRpb25UYWcg fHwgdG9rZW4ubmFtZSgpID09IGNvbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gY29sZ3JvdXBUYWcg fHwgdG9rZW4ubmFtZSgpID09IHRoVGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0ZFRhZyB8fCBpc1Rh YmxlQm9keUNvbnRleHRUYWcodG9rZW4ubmFtZSgpKSkgeworICAgICAgICBpZiAoaXNDYXB0aW9u Q29sT3JDb2xncm91cFRhZyh0b2tlbi5uYW1lKCkpCisgICAgICAgICAgICB8fCBpc1RhYmxlQ2Vs bENvbnRleHRUYWcodG9rZW4ubmFtZSgpKQorICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09 IHRyVGFnCisgICAgICAgICAgICB8fCBpc1RhYmxlQm9keUNvbnRleHRUYWcodG9rZW4ubmFtZSgp KSkgewogICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgY291bGQgYmUgbW9yZSBlZmZpY2llbnQu Ci0gICAgICAgICAgICBpZiAoIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5UYWJsZVNjb3BlKHRk VGFnKSB8fCAhbV90cmVlLm9wZW5FbGVtZW50cygpLT5pblRhYmxlU2NvcGUodGhUYWcpKSB7Cisg ICAgICAgICAgICBpZiAoIW1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5UYWJsZVNjb3BlKHRkVGFn KSAmJiAhbV90cmVlLm9wZW5FbGVtZW50cygpLT5pblRhYmxlU2NvcGUodGhUYWcpKSB7CisgICAg ICAgICAgICAgICAgQVNTRVJUKG1faXNQYXJzaW5nRnJhZ21lbnQpOwogICAgICAgICAgICAgICAg IHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIGNsb3NlVGhlQ2VsbCgpOworICAgICAgICAgICAgcHJvY2Vzc1N0YXJ0 VGFnKHRva2VuKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBwcm9j ZXNzU3RhcnRUYWdGb3JJbkJvZHkodG9rZW4pOwpAQCAtMTEyNiw3ICsxMTUzLDExIEBAIHZvaWQg SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikK ICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBJblNlbGVjdEluVGFibGVNb2RlOgogICAgICAgICBB U1NFUlQoaW5zZXJ0aW9uTW9kZSgpID09IEluU2VsZWN0SW5UYWJsZU1vZGUpOwotICAgICAgICBp ZiAodG9rZW4ubmFtZSgpID09IGNhcHRpb25UYWcgfHwgdG9rZW4ubmFtZSgpID09IHRhYmxlVGFn IHx8IGlzVGFibGVCb2R5Q29udGV4dFRhZyh0b2tlbi5uYW1lKCkpIHx8IHRva2VuLm5hbWUoKSA9 PSB0clRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdGRUYWcgfHwgdG9rZW4ubmFtZSgpID09IHRoVGFn KSB7CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gY2FwdGlvblRhZworICAgICAgICAgICAg fHwgdG9rZW4ubmFtZSgpID09IHRhYmxlVGFnCisgICAgICAgICAgICB8fCBpc1RhYmxlQm9keUNv bnRleHRUYWcodG9rZW4ubmFtZSgpKQorICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHRy VGFnCisgICAgICAgICAgICB8fCBpc1RhYmxlQ2VsbENvbnRleHRUYWcodG9rZW4ubmFtZSgpKSkg ewogICAgICAgICAgICAgcGFyc2VFcnJvcih0b2tlbik7CiAgICAgICAgICAgICBBdG9taWNIVE1M VG9rZW4gZW5kU2VsZWN0KEhUTUxUb2tlbjo6RW5kVGFnLCBzZWxlY3RUYWcubG9jYWxOYW1lKCkp OwogICAgICAgICAgICAgcHJvY2Vzc0VuZFRhZyhlbmRTZWxlY3QpOwpAQCAtMTYxNyw3ICsxNjQ4 LDEyIEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFnRm9ySW5UYWJsZShBdG9t aWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICByZXNldEluc2VydGlvbk1vZGVBcHByb3ByaWF0 ZWx5KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgaWYgKHRva2VuLm5hbWUoKSA9PSBi b2R5VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBjYXB0aW9uVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBj b2xUYWcgfHwgdG9rZW4ubmFtZSgpID09IGNvbGdyb3VwVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBo dG1sVGFnIHx8IGlzVGFibGVCb2R5Q29udGV4dFRhZyh0b2tlbi5uYW1lKCkpIHx8IHRva2VuLm5h bWUoKSA9PSB0ZFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdGhUYWcgfHwgdG9rZW4ubmFtZSgpID09 IHRyVGFnKSB7CisgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBib2R5VGFnCisgICAgICAgIHx8IGlz Q2FwdGlvbkNvbE9yQ29sZ3JvdXBUYWcodG9rZW4ubmFtZSgpKQorICAgICAgICB8fCB0b2tlbi5u YW1lKCkgPT0gaHRtbFRhZworICAgICAgICB8fCBpc1RhYmxlQm9keUNvbnRleHRUYWcodG9rZW4u bmFtZSgpKQorICAgICAgICB8fCBpc1RhYmxlQ2VsbENvbnRleHRUYWcodG9rZW4ubmFtZSgpKQor ICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gdHJUYWcpIHsKICAgICAgICAgcGFyc2VFcnJvcih0 b2tlbik7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xNjkzLDcgKzE3MjksMTMgQEAgdm9p ZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikK ICAgICAgICAgICAgIHByb2Nlc3NFbmRUYWcodG9rZW4pOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9Ci0gICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gYm9keVRhZyB8fCB0b2tlbi5u YW1lKCkgPT0gY29sVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBjb2xncm91cFRhZyB8fCB0b2tlbi5u YW1lKCkgPT0gaHRtbFRhZyB8fCBpc1RhYmxlQm9keUNvbnRleHRUYWcodG9rZW4ubmFtZSgpKSB8 fCB0b2tlbi5uYW1lKCkgPT0gdGRUYWcgfHwgdG9rZW4ubmFtZSgpID09IHRoVGFnIHx8IHRva2Vu Lm5hbWUoKSA9PSB0clRhZykgeworICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGJvZHlUYWcK KyAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBjb2xUYWcKKyAgICAgICAgICAgIHx8IHRv a2VuLm5hbWUoKSA9PSBjb2xncm91cFRhZworICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09 IGh0bWxUYWcKKyAgICAgICAgICAgIHx8IGlzVGFibGVCb2R5Q29udGV4dFRhZyh0b2tlbi5uYW1l KCkpCisgICAgICAgICAgICB8fCBpc1RhYmxlQ2VsbENvbnRleHRUYWcodG9rZW4ubmFtZSgpKQor ICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHRyVGFnKSB7CiAgICAgICAgICAgICBwYXJz ZUVycm9yKHRva2VuKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtMTc0MCw3 ICsxNzgyLDEwIEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFnKEF0b21pY0hU TUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBwcm9jZXNzRW5kVGFnKHRva2VuKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGJv ZHlUYWcgfHwgdG9rZW4ubmFtZSgpID09IGNhcHRpb25UYWcgfHwgdG9rZW4ubmFtZSgpID09IGNv bFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gY29sZ3JvdXBUYWcgfHwgdG9rZW4ubmFtZSgpID09IGh0 bWxUYWcgfHwgdG9rZW4ubmFtZSgpID09IHRkVGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0aFRhZykg eworICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGJvZHlUYWcKKyAgICAgICAgICAgIHx8IGlz Q2FwdGlvbkNvbE9yQ29sZ3JvdXBUYWcodG9rZW4ubmFtZSgpKQorICAgICAgICAgICAgfHwgdG9r ZW4ubmFtZSgpID09IGh0bWxUYWcKKyAgICAgICAgICAgIHx8IGlzVGFibGVDZWxsQ29udGV4dFRh Zyh0b2tlbi5uYW1lKCkpKSB7CiAgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtMTc0OCw3ICsxNzkzLDcgQEAgdm9pZCBIVE1M VHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWcoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBJbkNlbGxNb2RlOgogICAgICAgICBBU1NFUlQoaW5zZXJ0aW9u TW9kZSgpID09IEluQ2VsbE1vZGUpOwotICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IHRoVGFn IHx8IHRva2VuLm5hbWUoKSA9PSB0ZFRhZykgeworICAgICAgICBpZiAoaXNUYWJsZUNlbGxDb250 ZXh0VGFnKHRva2VuLm5hbWUoKSkpIHsKICAgICAgICAgICAgIGlmICghbV90cmVlLm9wZW5FbGVt ZW50cygpLT5pblRhYmxlU2NvcGUodG9rZW4ubmFtZSgpKSkgewogICAgICAgICAgICAgICAgIHBh cnNlRXJyb3IodG9rZW4pOwogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTE3NjMsNyArMTgw OCw5IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFnKEF0b21pY0hUTUxUb2tl biYgdG9rZW4pCiAgICAgICAgICAgICBBU1NFUlQobV90cmVlLmN1cnJlbnRFbGVtZW50KCktPmhh c1RhZ05hbWUodHJUYWcpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAg ICBpZiAodG9rZW4ubmFtZSgpID09IGJvZHlUYWcgfHwgdG9rZW4ubmFtZSgpID09IGNhcHRpb25U YWcgfHwgdG9rZW4ubmFtZSgpID09IGNvbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gY29sZ3JvdXBU YWcgfHwgdG9rZW4ubmFtZSgpID09IGh0bWxUYWcpIHsKKyAgICAgICAgaWYgKHRva2VuLm5hbWUo KSA9PSBib2R5VGFnCisgICAgICAgICAgICB8fCBpc0NhcHRpb25Db2xPckNvbGdyb3VwVGFnKHRv a2VuLm5hbWUoKSkKKyAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBodG1sVGFnKSB7CiAg ICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQpAQCAtMTgwNiw3ICsxODUzLDExIEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNz RW5kVGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgICAgICBwcm9jZXNzRW5kVGFn KHRva2VuKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBpZiAodG9r ZW4ubmFtZSgpID09IGJvZHlUYWcgfHwgdG9rZW4ubmFtZSgpID09IGNhcHRpb25UYWcgfHwgdG9r ZW4ubmFtZSgpID09IGNvbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gY29sZ3JvdXBUYWcgfHwgdG9r ZW4ubmFtZSgpID09IGh0bWxUYWcgfHwgdG9rZW4ubmFtZSgpID09IHRkVGFnIHx8IHRva2VuLm5h bWUoKSA9PSB0aFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdHJUYWcpIHsKKyAgICAgICAgaWYgKHRv a2VuLm5hbWUoKSA9PSBib2R5VGFnCisgICAgICAgICAgICB8fCBpc0NhcHRpb25Db2xPckNvbGdy b3VwVGFnKHRva2VuLm5hbWUoKSkKKyAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBodG1s VGFnCisgICAgICAgICAgICB8fCBpc1RhYmxlQ2VsbENvbnRleHRUYWcodG9rZW4ubmFtZSgpKQor ICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHRyVGFnKSB7CiAgICAgICAgICAgICBwYXJz ZUVycm9yKHRva2VuKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtMTg4NCw3 ICsxOTM1LDExIEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFnKEF0b21pY0hU TUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgSW5TZWxlY3RJblRhYmxl TW9kZToKICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJblNlbGVjdEluVGFibGVN b2RlKTsKLSAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBjYXB0aW9uVGFnIHx8IHRva2VuLm5h bWUoKSA9PSB0YWJsZVRhZyB8fCBpc1RhYmxlQm9keUNvbnRleHRUYWcodG9rZW4ubmFtZSgpKSB8 fCB0b2tlbi5uYW1lKCkgPT0gdHJUYWcgfHwgdG9rZW4ubmFtZSgpID09IHRkVGFnIHx8IHRva2Vu Lm5hbWUoKSA9PSB0aFRhZykgeworICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGNhcHRpb25U YWcKKyAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSB0YWJsZVRhZworICAgICAgICAgICAg fHwgaXNUYWJsZUJvZHlDb250ZXh0VGFnKHRva2VuLm5hbWUoKSkKKyAgICAgICAgICAgIHx8IHRv a2VuLm5hbWUoKSA9PSB0clRhZworICAgICAgICAgICAgfHwgaXNUYWJsZUNlbGxDb250ZXh0VGFn KHRva2VuLm5hbWUoKSkpIHsKICAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOwogICAgICAg ICAgICAgaWYgKG1fdHJlZS5vcGVuRWxlbWVudHMoKS0+aW5UYWJsZVNjb3BlKHRva2VuLm5hbWUo KSkpIHsKICAgICAgICAgICAgICAgICBBdG9taWNIVE1MVG9rZW4gZW5kU2VsZWN0KEhUTUxUb2tl bjo6RW5kVGFnLCBzZWxlY3RUYWcubG9jYWxOYW1lKCkpOwo=