124530 2013-11-18 11:29:50 -0800 Change mediasource and mediastream modules to use nullptr 2013-11-18 12:40:19 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 nick.diego nick.diego commit-queue eric.carlson glenn hta jer.noble tommyw oldest_to_newest 951714 0 nick.diego 2013-11-18 11:29:50 -0800 Change mediasource and mediastream modules to use nullptr 951737 1 217218 nick.diego 2013-11-18 11:57:52 -0800 Created attachment 217218 Patch 951743 2 217218 thorton 2013-11-18 12:14:59 -0800 Comment on attachment 217218 Patch I think (correct me if I'm wrong) we don't generally do these kind of patches so as to preserve usefulness of SVN blame, but given the havoc wreaked by refification, perhaps that's not a goal anymore. 951753 3 217218 commit-queue 2013-11-18 12:40:17 -0800 Comment on attachment 217218 Patch Clearing flags on attachment: 217218 Committed r159447: <http://trac.webkit.org/changeset/159447> 951754 4 commit-queue 2013-11-18 12:40:19 -0800 All reviewed patches have been landed. Closing bug. 217218 2013-11-18 11:57:52 -0800 2013-11-18 12:40:17 -0800 Patch bug-124530-20131118160919.patch text/plain 15632 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5NDQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWNiN2RiZjQ2NTk0Yzcw YzVhMmQzNTA2NDVjMzQ1NmQ5NGNmZTgwZC4uNDgwZWJmOTZiOGRmZDU4NjI3NzU0YzUxOTA5YjMy MTZhM2ExNzRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDEzLTExLTE4ICBOaWNr IERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3NzYS5vcmc+CiAKKyAgICAgICAgQ2hh bmdlIG1lZGlhc291cmNlIGFuZCBtZWRpYXN0cmVhbSBtb2R1bGVzIHRvIHVzZSBudWxscHRyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjQ1MzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVz dHMgbmVlZGVkLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBNb2R1bGVzL21lZGlh c291cmNlL01lZGlhU291cmNlLmNwcDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc291cmNlL1Nv dXJjZUJ1ZmZlci5jcHA6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVh bS5jcHA6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEVE1GU2VuZGVyLmNwcDoK KyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVsLmNwcDoKKyAgICAg ICAgKiBNb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0ljZUNhbmRpZGF0ZS5jcHA6CisgICAgICAgICog TW9kdWxlcy9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgICogTW9k dWxlcy9tZWRpYXN0cmVhbS9SVENTZXNzaW9uRGVzY3JpcHRpb24uY3BwOgorICAgICAgICAqIE1v ZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3RhdHNSZXNwb25zZS5jcHA6CisgICAgICAgICogTW9kdWxl cy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFSZXF1ZXN0LmNwcDoKKworMjAxMy0xMS0xOCAgTmljayBE aWVnbyBZYW1hbmUgIDxuaWNrLnlhbWFuZUBvcGVuYm9zc2Eub3JnPgorCiAgICAgICAgIENoYW5n ZSB3ZWJhdWRpbyB0byB1c2UgbnVsbHB0ciBmb3IgbnVsbCBwb2ludGVycwogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0NTI2CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2UuY3BwIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHAKaW5kZXggNmVl ZjBjOWU0OWUxZTllMjQxYTc1YjY0ZWUyM2RiYzE1MGMwMjBiOS4uYjRjYTNkNTM3MzczZjBlNzc4 NzIxYzEyMTVlZWNhYWQxZmY0OWUyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHAKQEAgLTg0LDIxICs4NCwyMSBAQCBTb3VyY2VC dWZmZXIqIE1lZGlhU291cmNlOjphZGRTb3VyY2VCdWZmZXIoY29uc3QgU3RyaW5nJiB0eXBlLCBF eGNlcHRpb25Db2RlJiBlYwogICAgIC8vIGFib3J0IHRoZXNlIHN0ZXBzLgogICAgIGlmICh0eXBl LmlzTnVsbCgpIHx8IHR5cGUuaXNFbXB0eSgpKSB7CiAgICAgICAgIGVjID0gSU5WQUxJRF9BQ0NF U1NfRVJSOwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAg fQogCiAgICAgLy8gMi4gSWYgdHlwZSBjb250YWlucyBhIE1JTUUgdHlwZSB0aGF0IGlzIG5vdCBz dXBwb3J0ZWQgLi4uLCB0aGVuIHRocm93IGEKICAgICAvLyBOT1RfU1VQUE9SVEVEX0VSUiBleGNl cHRpb24gYW5kIGFib3J0IHRoZXNlIHN0ZXBzLgogICAgIGlmICghaXNUeXBlU3VwcG9ydGVkKHR5 cGUpKSB7CiAgICAgICAgIGVjID0gTk9UX1NVUFBPUlRFRF9FUlI7Ci0gICAgICAgIHJldHVybiAw OworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKICAgICAvLyA0LiBJZiB0aGUgcmVh ZHlTdGF0ZSBhdHRyaWJ1dGUgaXMgbm90IGluIHRoZSAib3BlbiIgc3RhdGUgdGhlbiB0aHJvdyBh bgogICAgIC8vIElOVkFMSURfU1RBVEVfRVJSIGV4Y2VwdGlvbiBhbmQgYWJvcnQgdGhlc2Ugc3Rl cHMuCiAgICAgaWYgKCFpc09wZW4oKSkgewogICAgICAgICBlYyA9IElOVkFMSURfU1RBVEVfRVJS OwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCiAg ICAgLy8gNS4gQ3JlYXRlIGEgbmV3IFNvdXJjZUJ1ZmZlciBvYmplY3QgYW5kIGFzc29jaWF0ZWQg cmVzb3VyY2VzLgpAQCAtMTA5LDcgKzEwOSw3IEBAIFNvdXJjZUJ1ZmZlciogTWVkaWFTb3VyY2U6 OmFkZFNvdXJjZUJ1ZmZlcihjb25zdCBTdHJpbmcmIHR5cGUsIEV4Y2VwdGlvbkNvZGUmIGVjCiAg ICAgICAgIEFTU0VSVChlYyA9PSBOT1RfU1VQUE9SVEVEX0VSUiB8fCBlYyA9PSBRVU9UQV9FWENF RURFRF9FUlIpOwogICAgICAgICAvLyAyLiBJZiB0eXBlIGNvbnRhaW5zIGEgTUlNRSB0eXBlIHRo YXQgaXMgbm90IHN1cHBvcnRlZCAuLi4sIHRoZW4gdGhyb3cgYSBOT1RfU1VQUE9SVEVEX0VSUiBl eGNlcHRpb24gYW5kIGFib3J0IHRoZXNlIHN0ZXBzLgogICAgICAgICAvLyAzLiBJZiB0aGUgdXNl ciBhZ2VudCBjYW4ndCBoYW5kbGUgYW55IG1vcmUgU291cmNlQnVmZmVyIG9iamVjdHMgdGhlbiB0 aHJvdyBhIFFVT1RBX0VYQ0VFREVEX0VSUiBleGNlcHRpb24gYW5kIGFib3J0IHRoZXNlIHN0ZXBz Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKICAg ICBSZWZQdHI8U291cmNlQnVmZmVyPiBidWZmZXIgPSBTb3VyY2VCdWZmZXI6OmNyZWF0ZShzb3Vy Y2VCdWZmZXJQcml2YXRlLnJlbGVhc2VOb25OdWxsKCksIHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCmluZGV4IDJjMDY5 MDU1MDU4MGU4N2YxYzI3MDE4MjFjYTBhYWJjOTlmYzEwODQuLjFiNzQwMTQ1YTcyYzBlMDE3NjBi ZTc3YTMxY2ZhMjg0Yzk5NDQ5MjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKQEAgLTExNCw3ICsxMTQsNyBAQCBQYXNzUmVm UHRyPFRpbWVSYW5nZXM+IFNvdXJjZUJ1ZmZlcjo6YnVmZmVyZWQoRXhjZXB0aW9uQ29kZSYgZWMp IGNvbnN0CiAgICAgLy8gICAgSU5WQUxJRF9TVEFURV9FUlIgZXhjZXB0aW9uIGFuZCBhYm9ydCB0 aGVzZSBzdGVwcy4KICAgICBpZiAoaXNSZW1vdmVkKCkpIHsKICAgICAgICAgZWMgPSBJTlZBTElE X1NUQVRFX0VSUjsKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwog ICAgIH0KIAogICAgIC8vIDIuIFJldHVybiBhIG5ldyBzdGF0aWMgbm9ybWFsaXplZCBUaW1lUmFu Z2VzIG9iamVjdCBmb3IgdGhlIG1lZGlhIHNlZ21lbnRzIGJ1ZmZlcmVkLgpAQCAtMzg2LDcgKzM4 Niw3IEBAIGNvbnN0IEF0b21pY1N0cmluZyYgU291cmNlQnVmZmVyOjpuZXR3b3JrRXJyb3IoKQog VmlkZW9UcmFja0xpc3QqIFNvdXJjZUJ1ZmZlcjo6dmlkZW9UcmFja3MoKQogewogICAgIGlmICgh bV9zb3VyY2UtPm1lZGlhRWxlbWVudCgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAKICAgICBpZiAoIW1fdmlkZW9UcmFja3MpCiAgICAgICAgIG1fdmlkZW9U cmFja3MgPSBWaWRlb1RyYWNrTGlzdDo6Y3JlYXRlKG1fc291cmNlLT5tZWRpYUVsZW1lbnQoKSwg QWN0aXZlRE9NT2JqZWN0OjpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOwpAQCAtMzk3LDcgKzM5 Nyw3IEBAIFZpZGVvVHJhY2tMaXN0KiBTb3VyY2VCdWZmZXI6OnZpZGVvVHJhY2tzKCkKIEF1ZGlv VHJhY2tMaXN0KiBTb3VyY2VCdWZmZXI6OmF1ZGlvVHJhY2tzKCkKIHsKICAgICBpZiAoIW1fc291 cmNlLT5tZWRpYUVsZW1lbnQoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBu dWxscHRyOwogCiAgICAgaWYgKCFtX2F1ZGlvVHJhY2tzKQogICAgICAgICBtX2F1ZGlvVHJhY2tz ID0gQXVkaW9UcmFja0xpc3Q6OmNyZWF0ZShtX3NvdXJjZS0+bWVkaWFFbGVtZW50KCksIEFjdGl2 ZURPTU9iamVjdDo6c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKTsKQEAgLTQwOCw3ICs0MDgsNyBA QCBBdWRpb1RyYWNrTGlzdCogU291cmNlQnVmZmVyOjphdWRpb1RyYWNrcygpCiBUZXh0VHJhY2tM aXN0KiBTb3VyY2VCdWZmZXI6OnRleHRUcmFja3MoKQogewogICAgIGlmICghbV9zb3VyY2UtPm1l ZGlhRWxlbWVudCgpKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAKICAgICBpZiAoIW1fdGV4dFRyYWNrcykKICAgICAgICAgbV90ZXh0VHJhY2tzID0gVGV4dFRy YWNrTGlzdDo6Y3JlYXRlKG1fc291cmNlLT5tZWRpYUVsZW1lbnQoKSwgQWN0aXZlRE9NT2JqZWN0 OjpzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9NZWRpYVN0cmVhbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtLmNwcAppbmRleCA1MjUyNTMwYThhM2ZiMDFjYzIw YmE0ZDFhNjJmYTZjMzY0ZTg4ZmVjLi5mZWExN2ZhZDE2YmNiY2FlMzAxYjIwNjM1YTQyMDEzZWE1 ZjllMWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01l ZGlhU3RyZWFtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL01l ZGlhU3RyZWFtLmNwcApAQCAtMjQ0LDcgKzI0NCw3IEBAIE1lZGlhU3RyZWFtVHJhY2sqIE1lZGlh U3RyZWFtOjpnZXRUcmFja0J5SWQoU3RyaW5nIGlkKQogICAgICAgICAgICAgcmV0dXJuICgqaXRl cikuZ2V0KCk7CiAgICAgfQogCi0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIG51bGxwdHI7CiB9 CiAKIHZvaWQgTWVkaWFTdHJlYW06OnRyYWNrRGlkRW5kKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDRFRNRlNlbmRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RUTUZTZW5kZXIuY3BwCmluZGV4IGQzNjVjNWVl ZDY3NzIyOWIyOTYzNzE1ZTM2M2I1ZDNkNGNkZTE5ODIuLmZiMDVlOTBmNDE3MGE2MjBjNmJlYzMw ZDNlOWY3MmRjYjdmMjFjMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vUlRDRFRNRlNlbmRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYXN0cmVhbS9SVENEVE1GU2VuZGVyLmNwcApAQCAtNTAsNyArNTAsNyBAQCBQYXNzUmVmUHRy PFJUQ0RUTUZTZW5kZXI+IFJUQ0RUTUZTZW5kZXI6OmNyZWF0ZShTY3JpcHRFeGVjdXRpb25Db250 ZXh0KiBjb250ZXh0LAogICAgIE93blB0cjxSVENEVE1GU2VuZGVySGFuZGxlcj4gaGFuZGxlciA9 IHBlZXJDb25uZWN0aW9uSGFuZGxlci0+Y3JlYXRlRFRNRlNlbmRlcih0cmFjay0+c291cmNlKCkp OwogICAgIGlmICghaGFuZGxlcikgewogICAgICAgICBlYyA9IE5PVF9TVVBQT1JURURfRVJSOwot ICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCiAgICAg UmVmUHRyPFJUQ0RUTUZTZW5kZXI+IGR0bWZTZW5kZXIgPSBhZG9wdFJlZihuZXcgUlRDRFRNRlNl bmRlcihjb250ZXh0LCB0cmFjaywgaGFuZGxlci5yZWxlYXNlKCkpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWwuY3BwIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbC5jcHAKaW5kZXgg YTFlMGI1NjM5MDEwMzY1ZmM5NDY2YWU1Y2E4OGMwMTExZjIzOGUwNi4uOGRkMmQwNTE0ZWZkYWU3 Nzk4OTYyYjVhYmViMjdiYjY1YmMyM2UwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbC5jcHAKQEAgLTY3LDcgKzY3LDcgQEAg UGFzc1JlZlB0cjxSVENEYXRhQ2hhbm5lbD4gUlRDRGF0YUNoYW5uZWw6OmNyZWF0ZShTY3JpcHRF eGVjdXRpb25Db250ZXh0KiBjb250ZXgKICAgICBPd25QdHI8UlRDRGF0YUNoYW5uZWxIYW5kbGVy PiBoYW5kbGVyID0gcGVlckNvbm5lY3Rpb25IYW5kbGVyLT5jcmVhdGVEYXRhQ2hhbm5lbChsYWJl bCwgaW5pdERhdGEpOwogICAgIGlmICghaGFuZGxlcikgewogICAgICAgICBlYyA9IE5PVF9TVVBQ T1JURURfRVJSOwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAg ICAgfQogICAgIHJldHVybiBhZG9wdFJlZihuZXcgUlRDRGF0YUNoYW5uZWwoY29udGV4dCwgaGFu ZGxlci5yZWxlYXNlKCkpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vUlRDSWNlQ2FuZGlkYXRlLmNwcAppbmRleCBiODA1YzUyYjBmMGNlYmYxMzA4 YzNiMDdlNmUxY2Q1Y2E0NDFkODU1Li5jMGZjNzAzMjRhYzZkNGExMTgxOGZjNjUxZDhkMWUzYjBm NmZhZTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JU Q0ljZUNhbmRpZGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9SVENJY2VDYW5kaWRhdGUuY3BwCkBAIC00OCwxNCArNDgsMTQgQEAgUGFzc1JlZlB0cjxSVENJ Y2VDYW5kaWRhdGU+IFJUQ0ljZUNhbmRpZGF0ZTo6Y3JlYXRlKGNvbnN0IERpY3Rpb25hcnkmIGRp Y3Rpb25hcnkKICAgICBib29sIG9rID0gZGljdGlvbmFyeS5nZXQoImNhbmRpZGF0ZSIsIGNhbmRp ZGF0ZSk7CiAgICAgaWYgKG9rICYmIGNhbmRpZGF0ZS5pc0VtcHR5KCkpIHsKICAgICAgICAgZWMg PSBUWVBFX01JU01BVENIX0VSUjsKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBu dWxscHRyOwogICAgIH0KIAogICAgIFN0cmluZyBzZHBNaWQ7CiAgICAgb2sgPSBkaWN0aW9uYXJ5 LmdldCgic2RwTWlkIiwgc2RwTWlkKTsKICAgICBpZiAob2sgJiYgc2RwTWlkLmlzRW1wdHkoKSkg ewogICAgICAgICBlYyA9IFRZUEVfTUlTTUFUQ0hfRVJSOwotICAgICAgICByZXR1cm4gMDsKKyAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCiAgICAgU3RyaW5nIHRlbXBMaW5lSW5kZXg7 CkBAIC02OCw3ICs2OCw3IEBAIFBhc3NSZWZQdHI8UlRDSWNlQ2FuZGlkYXRlPiBSVENJY2VDYW5k aWRhdGU6OmNyZWF0ZShjb25zdCBEaWN0aW9uYXJ5JiBkaWN0aW9uYXJ5CiAgICAgICAgIHNkcE1M aW5lSW5kZXggPSB0ZW1wTGluZUluZGV4LnRvVUludFN0cmljdCgmaW50Q29udmVyc2lvbk9rKTsK ICAgICAgICAgaWYgKCFpbnRDb252ZXJzaW9uT2spIHsKICAgICAgICAgICAgIGVjID0gVFlQRV9N SVNNQVRDSF9FUlI7Ci0gICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgICAgIHJldHVybiBu dWxscHRyOwogICAgICAgICB9CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3BwCmluZGV4IDg3MGIxOGMx NjFmNzUzNGY4OTBmZjMxODlhYzQ5NTcwYzAyMWI1MzYuLjhlOGUxNzBmYTdhODBhZWFhZWQyOGYy MjAwZDQ0NzljMDkyZTFlOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVk aWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24uY3BwCkBAIC02OCwyMCArNjgsMjAgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogUGFzc1JlZlB0cjxSVENDb25maWd1cmF0aW9uPiBSVENQZWVy Q29ubmVjdGlvbjo6cGFyc2VDb25maWd1cmF0aW9uKGNvbnN0IERpY3Rpb25hcnkmIGNvbmZpZ3Vy YXRpb24sIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIGlmIChjb25maWd1cmF0aW9uLmlzVW5k ZWZpbmVkT3JOdWxsKCkpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0 cjsKIAogICAgIEFycmF5VmFsdWUgaWNlU2VydmVyczsKICAgICBib29sIG9rID0gY29uZmlndXJh dGlvbi5nZXQoImljZVNlcnZlcnMiLCBpY2VTZXJ2ZXJzKTsKICAgICBpZiAoIW9rIHx8IGljZVNl cnZlcnMuaXNVbmRlZmluZWRPck51bGwoKSkgewogICAgICAgICBlYyA9IFRZUEVfTUlTTUFUQ0hf RVJSOwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQog CiAgICAgc2l6ZV90IG51bWJlck9mU2VydmVyczsKICAgICBvayA9IGljZVNlcnZlcnMubGVuZ3Ro KG51bWJlck9mU2VydmVycyk7CiAgICAgaWYgKCFvaykgewogICAgICAgICBlYyA9IFRZUEVfTUlT TUFUQ0hfRVJSOwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAg ICAgfQogCiAgICAgUmVmUHRyPFJUQ0NvbmZpZ3VyYXRpb24+IHJ0Y0NvbmZpZ3VyYXRpb24gPSBS VENDb25maWd1cmF0aW9uOjpjcmVhdGUoKTsKQEAgLTkxLDE5ICs5MSwxOSBAQCBQYXNzUmVmUHRy PFJUQ0NvbmZpZ3VyYXRpb24+IFJUQ1BlZXJDb25uZWN0aW9uOjpwYXJzZUNvbmZpZ3VyYXRpb24o Y29uc3QgRGljdGlvbgogICAgICAgICBvayA9IGljZVNlcnZlcnMuZ2V0KGksIGljZVNlcnZlcik7 CiAgICAgICAgIGlmICghb2spIHsKICAgICAgICAgICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7 Ci0gICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAg ICAgICB9CiAKICAgICAgICAgU3RyaW5nIHVybFN0cmluZywgY3JlZGVudGlhbCwgdXNlcm5hbWU7 CiAgICAgICAgIG9rID0gaWNlU2VydmVyLmdldCgidXJsIiwgdXJsU3RyaW5nKTsKICAgICAgICAg aWYgKCFvaykgewogICAgICAgICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKLSAgICAgICAg ICAgIHJldHVybiAwOworICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIH0KICAg ICAgICAgVVJMIHVybChVUkwoKSwgdXJsU3RyaW5nKTsKICAgICAgICAgaWYgKCF1cmwuaXNWYWxp ZCgpIHx8ICEodXJsLnByb3RvY29sSXMoInR1cm4iKSB8fCB1cmwucHJvdG9jb2xJcygic3R1biIp KSkgewogICAgICAgICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKLSAgICAgICAgICAgIHJl dHVybiAwOworICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIH0KIAogICAgICAg ICBpY2VTZXJ2ZXIuZ2V0KCJjcmVkZW50aWFsIiwgY3JlZGVudGlhbCk7CkBAIC0xMTksMTYgKzEx OSwxNiBAQCBQYXNzUmVmUHRyPFJUQ1BlZXJDb25uZWN0aW9uPiBSVENQZWVyQ29ubmVjdGlvbjo6 Y3JlYXRlKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmCiB7CiAgICAgUmVmUHRyPFJUQ0NvbmZpZ3Vy YXRpb24+IGNvbmZpZ3VyYXRpb24gPSBwYXJzZUNvbmZpZ3VyYXRpb24ocnRjQ29uZmlndXJhdGlv biwgZWMpOwogICAgIGlmIChlYykKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBu dWxscHRyOwogCiAgICAgUmVmUHRyPE1lZGlhQ29uc3RyYWludHM+IGNvbnN0cmFpbnRzID0gTWVk aWFDb25zdHJhaW50c0ltcGw6OmNyZWF0ZShtZWRpYUNvbnN0cmFpbnRzLCBlYyk7CiAgICAgaWYg KGVjKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAgICBS ZWZQdHI8UlRDUGVlckNvbm5lY3Rpb24+IHBlZXJDb25uZWN0aW9uID0gYWRvcHRSZWYobmV3IFJU Q1BlZXJDb25uZWN0aW9uKGNvbnRleHQsIGNvbmZpZ3VyYXRpb24ucmVsZWFzZSgpLCBjb25zdHJh aW50cy5yZWxlYXNlKCksIGVjKSk7CiAgICAgcGVlckNvbm5lY3Rpb24tPnN1c3BlbmRJZk5lZWRl ZCgpOwogICAgIGlmIChlYykKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxs cHRyOwogCiAgICAgcmV0dXJuIHBlZXJDb25uZWN0aW9uLnJlbGVhc2UoKTsKIH0KQEAgLTIyOSw3 ICsyMjksNyBAQCBQYXNzUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gUlRDUGVlckNvbm5l Y3Rpb246OmxvY2FsRGVzY3JpcHRpb24oRXhjZXB0aW9uQwogICAgIFJlZlB0cjxSVENTZXNzaW9u RGVzY3JpcHRpb25EZXNjcmlwdG9yPiBkZXNjcmlwdG9yID0gbV9wZWVySGFuZGxlci0+bG9jYWxE ZXNjcmlwdGlvbigpOwogICAgIGlmICghZGVzY3JpcHRvcikgewogICAgICAgICBlYyA9IElOVkFM SURfU1RBVEVfRVJSOwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAgICAgfQogCiAgICAgUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbj4gc2Vzc2lvbkRlc2Ny aXB0aW9uID0gUlRDU2Vzc2lvbkRlc2NyaXB0aW9uOjpjcmVhdGUoZGVzY3JpcHRvci5yZWxlYXNl KCkpOwpAQCAtMjU4LDcgKzI1OCw3IEBAIFBhc3NSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9u PiBSVENQZWVyQ29ubmVjdGlvbjo6cmVtb3RlRGVzY3JpcHRpb24oRXhjZXB0aW9uCiAgICAgUmVm UHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbkRlc2NyaXB0b3I+IGRlc2NyaXB0b3IgPSBtX3BlZXJI YW5kbGVyLT5yZW1vdGVEZXNjcmlwdGlvbigpOwogICAgIGlmICghZGVzY3JpcHRvcikgewogICAg ICAgICBlYyA9IElOVkFMSURfU1RBVEVfRVJSOwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAgICAgfQogCiAgICAgUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlv bj4gZGVzYyA9IFJUQ1Nlc3Npb25EZXNjcmlwdGlvbjo6Y3JlYXRlKGRlc2NyaXB0b3IucmVsZWFz ZSgpKTsKQEAgLTQzNSw3ICs0MzUsNyBAQCBNZWRpYVN0cmVhbSogUlRDUGVlckNvbm5lY3Rpb246 OmdldFN0cmVhbUJ5SWQoY29uc3QgU3RyaW5nJiBzdHJlYW1JZCkKICAgICAgICAgICAgIHJldHVy biBpdGVyLT5nZXQoKTsKICAgICB9CiAKLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4gbnVsbHB0 cjsKIH0KIAogdm9pZCBSVENQZWVyQ29ubmVjdGlvbjo6Z2V0U3RhdHMoUGFzc1JlZlB0cjxSVENT dGF0c0NhbGxiYWNrPiBzdWNjZXNzQ2FsbGJhY2ssIFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1UcmFj az4gc2VsZWN0b3IpCkBAIC00NDksMTIgKzQ0OSwxMiBAQCBQYXNzUmVmUHRyPFJUQ0RhdGFDaGFu bmVsPiBSVENQZWVyQ29ubmVjdGlvbjo6Y3JlYXRlRGF0YUNoYW5uZWwoU3RyaW5nIGxhYmVsLCBj bwogewogICAgIGlmIChtX3NpZ25hbGluZ1N0YXRlID09IFNpZ25hbGluZ1N0YXRlQ2xvc2VkKSB7 CiAgICAgICAgIGVjID0gSU5WQUxJRF9TVEFURV9FUlI7Ci0gICAgICAgIHJldHVybiAwOworICAg ICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKICAgICBSZWZQdHI8UlRDRGF0YUNoYW5uZWw+ IGNoYW5uZWwgPSBSVENEYXRhQ2hhbm5lbDo6Y3JlYXRlKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQo KSwgbV9wZWVySGFuZGxlci5nZXQoKSwgbGFiZWwsIG9wdGlvbnMsIGVjKTsKICAgICBpZiAoZWMp Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIG1fZGF0 YUNoYW5uZWxzLmFwcGVuZChjaGFubmVsKTsKICAgICByZXR1cm4gY2hhbm5lbC5yZWxlYXNlKCk7 CkBAIC00NzMsMjQgKzQ3MywyNCBAQCBQYXNzUmVmUHRyPFJUQ0RUTUZTZW5kZXI+IFJUQ1BlZXJD b25uZWN0aW9uOjpjcmVhdGVEVE1GU2VuZGVyKFBhc3NSZWZQdHI8TWVkaWFTdAogewogICAgIGlm IChtX3NpZ25hbGluZ1N0YXRlID09IFNpZ25hbGluZ1N0YXRlQ2xvc2VkKSB7CiAgICAgICAgIGVj ID0gSU5WQUxJRF9TVEFURV9FUlI7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4g bnVsbHB0cjsKICAgICB9CiAKICAgICBpZiAoIXBycFRyYWNrKSB7CiAgICAgICAgIGVjID0gVHlw ZUVycm9yOwotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAg fQogCiAgICAgUmVmUHRyPE1lZGlhU3RyZWFtVHJhY2s+IHRyYWNrID0gcHJwVHJhY2s7CiAKICAg ICBpZiAoIWhhc0xvY2FsU3RyZWFtV2l0aFRyYWNrSWQodHJhY2stPmlkKCkpKSB7CiAgICAgICAg IGVjID0gU1lOVEFYX0VSUjsKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxs cHRyOwogICAgIH0KIAogICAgIFJlZlB0cjxSVENEVE1GU2VuZGVyPiBkdG1mU2VuZGVyID0gUlRD RFRNRlNlbmRlcjo6Y3JlYXRlKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgbV9wZWVySGFuZGxl ci5nZXQoKSwgdHJhY2sucmVsZWFzZSgpLCBlYyk7CiAgICAgaWYgKGVjKQotICAgICAgICByZXR1 cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgcmV0dXJuIGR0bWZTZW5kZXIucmVs ZWFzZSgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1JUQ1Nlc3Npb25EZXNjcmlwdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc3RyZWFtL1JUQ1Nlc3Npb25EZXNjcmlwdGlvbi5jcHAKaW5kZXggMjVhODI3OWUwOTc0ZDcw OWMzZTliYTE1OTQ2MTgzMzMxMDg1OGQwMC4uODViZmI1YzMxZTc2NGI2ZTgxODUyOTMzNThjYjE5 NmIwNzE1ODBkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9SVENTZXNzaW9uRGVzY3JpcHRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vUlRDU2Vzc2lvbkRlc2NyaXB0aW9uLmNwcApAQCAtNTIsMTQgKzUyLDE0IEBA IFBhc3NSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uPiBSVENTZXNzaW9uRGVzY3JpcHRpb246 OmNyZWF0ZShjb25zdCBEaWN0aW9uYXJ5CiAgICAgYm9vbCBvayA9IGRpY3Rpb25hcnkuZ2V0KCJ0 eXBlIiwgdHlwZSk7CiAgICAgaWYgKG9rICYmICF2ZXJpZnlUeXBlKHR5cGUpKSB7CiAgICAgICAg IGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1 cm4gbnVsbHB0cjsKICAgICB9CiAKICAgICBTdHJpbmcgc2RwOwogICAgIG9rID0gZGljdGlvbmFy eS5nZXQoInNkcCIsIHNkcCk7CiAgICAgaWYgKG9rICYmIHNkcC5pc0VtcHR5KCkpIHsKICAgICAg ICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJl dHVybiBudWxscHRyOwogICAgIH0KIAogICAgIHJldHVybiBhZG9wdFJlZihuZXcgUlRDU2Vzc2lv bkRlc2NyaXB0aW9uKFJUQ1Nlc3Npb25EZXNjcmlwdGlvbkRlc2NyaXB0b3I6OmNyZWF0ZSh0eXBl LCBzZHApKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFt L1JUQ1N0YXRzUmVzcG9uc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVh bS9SVENTdGF0c1Jlc3BvbnNlLmNwcAppbmRleCA0NzNiYTRlYmMwZGE0MmUxNTg4MzZlZjNjZjNh NmNmZTg5N2YyNDFiLi5jM2I0MWZlMTkyY2IwZTQ4Yjk2OTUwMmY2ZDUxMTM0YWNmMWM4N2NlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ1N0YXRzUmVz cG9uc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDU3Rh dHNSZXNwb25zZS5jcHAKQEAgLTQzLDcgKzQzLDcgQEAgUGFzc1JlZlB0cjxSVENTdGF0c1JlcG9y dD4gUlRDU3RhdHNSZXNwb25zZTo6bmFtZWRJdGVtKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkK IHsKICAgICBpZiAobV9pZG1hcC5maW5kKG5hbWUpICE9IG1faWRtYXAuZW5kKCkpCiAgICAgICAg IHJldHVybiBtX3Jlc3VsdFttX2lkbWFwLmdldChuYW1lKV07Ci0gICAgcmV0dXJuIDA7CisgICAg cmV0dXJuIG51bGxwdHI7CiB9CiAKIGJvb2wgUlRDU3RhdHNSZXNwb25zZTo6Y2FuR2V0SXRlbXNG b3JOYW1lKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vVXNlck1lZGlhUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1VzZXJNZWRpYVJlcXVlc3QuY3BwCmluZGV4IGVkNDQz ODA5YTViM2U3NzllNjQ0MjJiMmQ1ZjgwZmVlMmI3MjdhM2UuLmU0MzhkMzVhMmQ3YmQyMjI1YTZm NGE3YTc3OTdiY2VlNmJlZWNjMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMv bWVkaWFzdHJlYW0vVXNlck1lZGlhUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9Vc2VyTWVkaWFSZXF1ZXN0LmNwcApAQCAtNzUsMTQgKzc1LDE0IEBA IFBhc3NSZWZQdHI8VXNlck1lZGlhUmVxdWVzdD4gVXNlck1lZGlhUmVxdWVzdDo6Y3JlYXRlKFNj cmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvCiAKICAgICBSZWZQdHI8TWVkaWFDb25zdHJhaW50cz4g YXVkaW9Db25zdHJhaW50cyA9IHBhcnNlT3B0aW9ucyhvcHRpb25zLCBBdG9taWNTdHJpbmcoImF1 ZGlvIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCksIGVjKTsKICAgICBpZiAo ZWMpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogICAgIFJl ZlB0cjxNZWRpYUNvbnN0cmFpbnRzPiB2aWRlb0NvbnN0cmFpbnRzID0gcGFyc2VPcHRpb25zKG9w dGlvbnMsIEF0b21pY1N0cmluZygidmlkZW8iLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21M aXRlcmFsKSwgZWMpOwogICAgIGlmIChlYykKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJl dHVybiBudWxscHRyOwogCiAgICAgaWYgKCFhdWRpb0NvbnN0cmFpbnRzICYmICF2aWRlb0NvbnN0 cmFpbnRzKQotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAg ICByZXR1cm4gYWRvcHRSZWYobmV3IFVzZXJNZWRpYVJlcXVlc3QoY29udGV4dCwgY29udHJvbGxl ciwgYXVkaW9Db25zdHJhaW50cy5yZWxlYXNlKCksIHZpZGVvQ29uc3RyYWludHMucmVsZWFzZSgp LCBzdWNjZXNzQ2FsbGJhY2ssIGVycm9yQ2FsbGJhY2spKTsKIH0KQEAgLTEwNSw4ICsxMDUsOCBA QCBTZWN1cml0eU9yaWdpbiogVXNlck1lZGlhUmVxdWVzdDo6c2VjdXJpdHlPcmlnaW4oKSBjb25z dAogewogICAgIGlmIChtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQpCiAgICAgICAgIHJldHVybiBt X3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQtPnNlY3VyaXR5T3JpZ2luKCk7Ci0gICAgCi0gICAgcmV0 dXJuIDA7CisKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KICAgICAKIHZvaWQgVXNlck1lZGlhUmVx dWVzdDo6c3RhcnQoKQo=