87837 2012-05-30 02:35:34 -0700 Web Inspector: change type of injected script id from long to int 2012-06-01 01:23:25 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys abarth apavlov bweinstein haraken japhet joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 637066 0 yurys 2012-05-30 02:35:34 -0700 We pass it as int in the protocol so it doesn't make sense to declare it as long. 637070 1 144769 yurys 2012-05-30 02:37:02 -0700 Created attachment 144769 Patch 639088 2 yurys 2012-06-01 01:23:25 -0700 Committed r119198: <http://trac.webkit.org/changeset/119198> 144769 2012-05-30 02:37:02 -0700 2012-06-01 01:08:29 -0700 Patch bug-87837-20120530133701.patch text/plain 9109 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmI3Y2IzMTM0MDVhMTY1 MDI3NjRjNzVhMzQ5YThlZWNhMWMyMjAwZS4uYjAwYjRhNWYwYjRhMWQ2MWZjNDc5ZDRiYmFhNmI0 MWZkMTFiNTlmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTA1LTMwICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGNoYW5nZSB0eXBlIG9mIGluamVjdGVkIHNjcmlwdCBpZCBmcm9tIGxvbmcgdG8gaW50Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzgzNworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZWQgaW5q ZWN0ZWQgc2NyaXB0IGlkIHR5cGUgZnJvbSBsb25nIHRvIGludCBzbyB0aGF0IHdlIGRvbid0Cisg ICAgICAgIGxvc2UgcHJlY2lzaW9uIHdoZW4gc2VuZGluZyB0aGUgaWQgb3ZlciB0aGUgcHJvdG9j b2wuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0luamVjdGVkU2NyaXB0TWFuYWdlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbmplY3RlZFNjcmlwdE1hbmFnZXI6OmNyZWF0ZUluamVjdGVk U2NyaXB0KToKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2NyaXB0TWFuYWdlcjo6aW5qZWN0 ZWRTY3JpcHRGb3IpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEluamVjdGVkU2Ny aXB0TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmplY3RlZFNjcmlwdE1hbmFnZXI6 OmNyZWF0ZUluamVjdGVkU2NyaXB0KToKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2NyaXB0 TWFuYWdlcjo6aW5qZWN0ZWRTY3JpcHRGb3IpOgorICAgICAgICAqIGluc3BlY3Rvci9JbmplY3Rl ZFNjcmlwdE1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5qZWN0ZWRTY3JpcHRNYW5h Z2VyOjppbmplY3RlZFNjcmlwdEZvcklkKToKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2Ny aXB0TWFuYWdlcjo6aW5qZWN0ZWRTY3JpcHRJZEZvcik6CisgICAgICAgIChXZWJDb3JlOjpJbmpl Y3RlZFNjcmlwdE1hbmFnZXI6OmluamVjdFNjcmlwdCk6CisgICAgICAgICogaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0TWFuYWdlci5oOgorICAgICAgICAoSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKToK KyAgICAgICAgKiBpbnNwZWN0b3IvUGFnZVJ1bnRpbWVBZ2VudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpQYWdlUnVudGltZUFnZW50Ojpub3RpZnlDb250ZXh0Q3JlYXRlZCk6CisKIDIwMTItMDUt MjkgIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJv bWl1bV0gTW92ZSBmaWxlRXhpc3RzIHRvIFBsYXRmb3JtLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcAppbmRleCAyNDk5 OTNmMjc1Y2E1MjdhYzY5ZWFkYmFmNWY0MGRlN2RlM2QyZmM2Li4xNTc2ZDM0NmQwNmRjYTUwYzg0 ZjgzZTVmYjk2ZGQ2MWFmNTlkNjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0luamVjdGVkU2NyaXB0TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdE1hbmFnZXIuY3BwCkBAIC00OSw3ICs0OSw3IEBAIHVz aW5nIG5hbWVzcGFjZSBKU0M7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotU2NyaXB0T2JqZWN0 IEluamVjdGVkU2NyaXB0TWFuYWdlcjo6Y3JlYXRlSW5qZWN0ZWRTY3JpcHQoY29uc3QgU3RyaW5n JiBzb3VyY2UsIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgbG9uZyBpZCkKK1NjcmlwdE9iamVj dCBJbmplY3RlZFNjcmlwdE1hbmFnZXI6OmNyZWF0ZUluamVjdGVkU2NyaXB0KGNvbnN0IFN0cmlu ZyYgc291cmNlLCBTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUsIGludCBpZCkKIHsKICAgICBKU0xv Y2sgbG9jayhTaWxlbmNlQXNzZXJ0aW9uc09ubHkpOwogCkBAIC05NSw3ICs5NSw3IEBAIEluamVj dGVkU2NyaXB0IEluamVjdGVkU2NyaXB0TWFuYWdlcjo6aW5qZWN0ZWRTY3JpcHRGb3IoU2NyaXB0 U3RhdGUqIHNjcmlwdFN0YXRlCiAgICAgaWYgKCFtX2luc3BlY3RlZFN0YXRlQWNjZXNzQ2hlY2so c2NyaXB0U3RhdGUpKQogICAgICAgICByZXR1cm4gSW5qZWN0ZWRTY3JpcHQoKTsKIAotICAgIHBh aXI8bG9uZywgU2NyaXB0T2JqZWN0PiBpbmplY3RlZFNjcmlwdE9iamVjdCA9IGluamVjdFNjcmlw dChpbmplY3RlZFNjcmlwdFNvdXJjZSgpLCBzY3JpcHRTdGF0ZSk7CisgICAgcGFpcjxpbnQsIFNj cmlwdE9iamVjdD4gaW5qZWN0ZWRTY3JpcHRPYmplY3QgPSBpbmplY3RTY3JpcHQoaW5qZWN0ZWRT Y3JpcHRTb3VyY2UoKSwgc2NyaXB0U3RhdGUpOwogICAgIGdsb2JhbE9iamVjdC0+c2V0SW5qZWN0 ZWRTY3JpcHQoaW5qZWN0ZWRTY3JpcHRPYmplY3Quc2Vjb25kLmpzT2JqZWN0KCkpOwogICAgIElu amVjdGVkU2NyaXB0IHJlc3VsdChpbmplY3RlZFNjcmlwdE9iamVjdC5zZWNvbmQsIG1faW5zcGVj dGVkU3RhdGVBY2Nlc3NDaGVjayk7CiAgICAgbV9pZFRvSW5qZWN0ZWRTY3JpcHQuc2V0KGluamVj dGVkU2NyaXB0T2JqZWN0LmZpcnN0LCByZXN1bHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEluamVjdGVkU2NyaXB0TWFuYWdlci5jcHAK aW5kZXggNDU1NTlmYzZlY2ViMTk5ZmU1ZWE5ZWEyY2FjOTE4M2MxNWY5ODA4MC4uMzMzZmU1NzVj YjA3OGExMjc1NjdjNjVjMmM1MWRjZjdhNDZkMWMyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbmplY3RlZFNjcmlwdE1hbmFnZXIu Y3BwCkBAIC03Niw3ICs3Niw3IEBAIHN0YXRpYyB2ODo6TG9jYWw8djg6Ok9iamVjdD4gY3JlYXRl SW5qZWN0ZWRTY3JpcHRIb3N0VjhXcmFwcGVyKEluamVjdGVkU2NyaXB0SG9zCiAgICAgcmV0dXJu IGluc3RhbmNlOwogfQogCi1TY3JpcHRPYmplY3QgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOjpjcmVh dGVJbmplY3RlZFNjcmlwdChjb25zdCBTdHJpbmcmIHNjcmlwdFNvdXJjZSwgU2NyaXB0U3RhdGUq IGluc3BlY3RlZFNjcmlwdFN0YXRlLCBsb25nIGlkKQorU2NyaXB0T2JqZWN0IEluamVjdGVkU2Ny aXB0TWFuYWdlcjo6Y3JlYXRlSW5qZWN0ZWRTY3JpcHQoY29uc3QgU3RyaW5nJiBzY3JpcHRTb3Vy Y2UsIFNjcmlwdFN0YXRlKiBpbnNwZWN0ZWRTY3JpcHRTdGF0ZSwgaW50IGlkKQogewogICAgIHY4 OjpIYW5kbGVTY29wZSBzY29wZTsKIApAQCAtMTQ4LDcgKzE0OCw3IEBAIEluamVjdGVkU2NyaXB0 IEluamVjdGVkU2NyaXB0TWFuYWdlcjo6aW5qZWN0ZWRTY3JpcHRGb3IoU2NyaXB0U3RhdGUqIGlu c3BlY3RlZFNjCiAgICAgaWYgKCFtX2luc3BlY3RlZFN0YXRlQWNjZXNzQ2hlY2soaW5zcGVjdGVk U2NyaXB0U3RhdGUpKQogICAgICAgICByZXR1cm4gSW5qZWN0ZWRTY3JpcHQoKTsKIAotICAgIHBh aXI8bG9uZywgU2NyaXB0T2JqZWN0PiBpbmplY3RlZFNjcmlwdCA9IGluamVjdFNjcmlwdChpbmpl Y3RlZFNjcmlwdFNvdXJjZSgpLCBpbnNwZWN0ZWRTY3JpcHRTdGF0ZSk7CisgICAgcGFpcjxpbnQs IFNjcmlwdE9iamVjdD4gaW5qZWN0ZWRTY3JpcHQgPSBpbmplY3RTY3JpcHQoaW5qZWN0ZWRTY3Jp cHRTb3VyY2UoKSwgaW5zcGVjdGVkU2NyaXB0U3RhdGUpOwogICAgIEluamVjdGVkU2NyaXB0IHJl c3VsdChpbmplY3RlZFNjcmlwdC5zZWNvbmQsIG1faW5zcGVjdGVkU3RhdGVBY2Nlc3NDaGVjayk7 CiAgICAgbV9pZFRvSW5qZWN0ZWRTY3JpcHQuc2V0KGluamVjdGVkU2NyaXB0LmZpcnN0LCByZXN1 bHQpOwogICAgIGdsb2JhbC0+U2V0SGlkZGVuVmFsdWUoa2V5LCBpbmplY3RlZFNjcmlwdC5zZWNv bmQudjhPYmplY3QoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5q ZWN0ZWRTY3JpcHRNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3Rl ZFNjcmlwdE1hbmFnZXIuY3BwCmluZGV4IDhlZTVhOThjYzczM2NhMjM4MDI5NTEzYWRlNTUzZWY4 MjIyN2Y2MGIuLmU0MDZjNGE4ZTE1ODUwNjg2Zjc2NjRiMmM1ZGZmZWZjYjhhOTJkMmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuY3Bw CkBAIC03Nyw3ICs3Nyw3IEBAIEluamVjdGVkU2NyaXB0SG9zdCogSW5qZWN0ZWRTY3JpcHRNYW5h Z2VyOjppbmplY3RlZFNjcmlwdEhvc3QoKQogICAgIHJldHVybiBtX2luamVjdGVkU2NyaXB0SG9z dC5nZXQoKTsKIH0KIAotSW5qZWN0ZWRTY3JpcHQgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOjppbmpl Y3RlZFNjcmlwdEZvcklkKGxvbmcgaWQpCitJbmplY3RlZFNjcmlwdCBJbmplY3RlZFNjcmlwdE1h bmFnZXI6OmluamVjdGVkU2NyaXB0Rm9ySWQoaW50IGlkKQogewogICAgIElkVG9JbmplY3RlZFNj cmlwdE1hcDo6aXRlcmF0b3IgaXQgPSBtX2lkVG9JbmplY3RlZFNjcmlwdC5maW5kKGlkKTsKICAg ICBpZiAoaXQgIT0gbV9pZFRvSW5qZWN0ZWRTY3JpcHQuZW5kKCkpCkBAIC04OSwxMiArODksMTIg QEAgSW5qZWN0ZWRTY3JpcHQgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOjppbmplY3RlZFNjcmlwdEZv cklkKGxvbmcgaWQpCiAgICAgcmV0dXJuIEluamVjdGVkU2NyaXB0KCk7CiB9CiAKLWxvbmcgSW5q ZWN0ZWRTY3JpcHRNYW5hZ2VyOjppbmplY3RlZFNjcmlwdElkRm9yKFNjcmlwdFN0YXRlKiBzY3Jp cHRTdGF0ZSkKK2ludCBJbmplY3RlZFNjcmlwdE1hbmFnZXI6OmluamVjdGVkU2NyaXB0SWRGb3Io U2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlKQogewogICAgIFNjcmlwdFN0YXRlVG9JZDo6aXRlcmF0 b3IgaXQgPSBtX3NjcmlwdFN0YXRlVG9JZC5maW5kKHNjcmlwdFN0YXRlKTsKICAgICBpZiAoaXQg IT0gbV9zY3JpcHRTdGF0ZVRvSWQuZW5kKCkpCiAgICAgICAgIHJldHVybiBpdC0+c2Vjb25kOwot ICAgIGxvbmcgaWQgPSBtX25leHRJbmplY3RlZFNjcmlwdElkKys7CisgICAgaW50IGlkID0gbV9u ZXh0SW5qZWN0ZWRTY3JpcHRJZCsrOwogICAgIG1fc2NyaXB0U3RhdGVUb0lkLnNldChzY3JpcHRT dGF0ZSwgaWQpOwogICAgIHJldHVybiBpZDsKIH0KQEAgLTE2Niw5ICsxNjYsOSBAQCBTdHJpbmcg SW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOjppbmplY3RlZFNjcmlwdFNvdXJjZSgpCiAgICAgcmV0dXJu IFN0cmluZyhyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihJbmplY3RlZFNjcmlwdFNvdXJj ZV9qcyksIHNpemVvZihJbmplY3RlZFNjcmlwdFNvdXJjZV9qcykpOwogfQogCi1wYWlyPGxvbmcs IFNjcmlwdE9iamVjdD4gSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyOjppbmplY3RTY3JpcHQoY29uc3Qg U3RyaW5nJiBzb3VyY2UsIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSkKK3BhaXI8aW50LCBTY3Jp cHRPYmplY3Q+IEluamVjdGVkU2NyaXB0TWFuYWdlcjo6aW5qZWN0U2NyaXB0KGNvbnN0IFN0cmlu ZyYgc291cmNlLCBTY3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUpCiB7Ci0gICAgbG9uZyBpZCA9IGlu amVjdGVkU2NyaXB0SWRGb3Ioc2NyaXB0U3RhdGUpOworICAgIGludCBpZCA9IGluamVjdGVkU2Ny aXB0SWRGb3Ioc2NyaXB0U3RhdGUpOwogICAgIHJldHVybiBzdGQ6Om1ha2VfcGFpcihpZCwgY3Jl YXRlSW5qZWN0ZWRTY3JpcHQoc291cmNlLCBzY3JpcHRTdGF0ZSwgaWQpKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0TWFuYWdlci5oIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0TWFuYWdlci5oCmluZGV4IDRk ZjNiZDllNTFkYTE1N2IyZTIxNjIzZGY3OWE4MWJkNDE0NzlhNDQuLmE5YmRjYTUyZmNiYzIyN2Fi MjkxYWI3NGE2ZWI4OTE4ZjA0YmQ4ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbmplY3RlZFNjcmlwdE1hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLmgKQEAgLTU1LDEwICs1NSwxMCBAQCBwdWJsaWM6CiAK ICAgICBJbmplY3RlZFNjcmlwdEhvc3QqIGluamVjdGVkU2NyaXB0SG9zdCgpOwogCi0gICAgcGFp cjxsb25nLCBTY3JpcHRPYmplY3Q+IGluamVjdFNjcmlwdChjb25zdCBTdHJpbmcmIHNvdXJjZSwg U2NyaXB0U3RhdGUqKTsKKyAgICBwYWlyPGludCwgU2NyaXB0T2JqZWN0PiBpbmplY3RTY3JpcHQo Y29uc3QgU3RyaW5nJiBzb3VyY2UsIFNjcmlwdFN0YXRlKik7CiAgICAgSW5qZWN0ZWRTY3JpcHQg aW5qZWN0ZWRTY3JpcHRGb3IoU2NyaXB0U3RhdGUqKTsKLSAgICBJbmplY3RlZFNjcmlwdCBpbmpl Y3RlZFNjcmlwdEZvcklkKGxvbmcpOwotICAgIGxvbmcgaW5qZWN0ZWRTY3JpcHRJZEZvcihTY3Jp cHRTdGF0ZSopOworICAgIEluamVjdGVkU2NyaXB0IGluamVjdGVkU2NyaXB0Rm9ySWQoaW50KTsK KyAgICBpbnQgaW5qZWN0ZWRTY3JpcHRJZEZvcihTY3JpcHRTdGF0ZSopOwogICAgIEluamVjdGVk U2NyaXB0IGluamVjdGVkU2NyaXB0Rm9yT2JqZWN0SWQoY29uc3QgU3RyaW5nJiBvYmplY3RJZCk7 CiAgICAgdm9pZCBkaXNjYXJkSW5qZWN0ZWRTY3JpcHRzKCk7CiAgICAgdm9pZCBkaXNjYXJkSW5q ZWN0ZWRTY3JpcHRzRm9yKERPTVdpbmRvdyopOwpAQCAtNzAsMTggKzcwLDE4IEBAIHByaXZhdGU6 CiAgICAgZXhwbGljaXQgSW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKEluc3BlY3RlZFN0YXRlQWNjZXNz Q2hlY2spOwogCiAgICAgU3RyaW5nIGluamVjdGVkU2NyaXB0U291cmNlKCk7Ci0gICAgU2NyaXB0 T2JqZWN0IGNyZWF0ZUluamVjdGVkU2NyaXB0KGNvbnN0IFN0cmluZyYgc291cmNlLCBTY3JpcHRT dGF0ZSosIGxvbmcgaWQpOworICAgIFNjcmlwdE9iamVjdCBjcmVhdGVJbmplY3RlZFNjcmlwdChj b25zdCBTdHJpbmcmIHNvdXJjZSwgU2NyaXB0U3RhdGUqLCBpbnQgaWQpOwogICAgIHZvaWQgZGlz Y2FyZEluamVjdGVkU2NyaXB0KFNjcmlwdFN0YXRlKik7CiAKICAgICBzdGF0aWMgYm9vbCBjYW5B Y2Nlc3NJbnNwZWN0ZWRXaW5kb3coU2NyaXB0U3RhdGUqKTsKICAgICBzdGF0aWMgYm9vbCBjYW5B Y2Nlc3NJbnNwZWN0ZWRXb3JrZXJDb250ZXh0KFNjcmlwdFN0YXRlKik7CiAKLSAgICBsb25nIG1f bmV4dEluamVjdGVkU2NyaXB0SWQ7Ci0gICAgdHlwZWRlZiBIYXNoTWFwPGxvbmcsIEluamVjdGVk U2NyaXB0PiBJZFRvSW5qZWN0ZWRTY3JpcHRNYXA7CisgICAgaW50IG1fbmV4dEluamVjdGVkU2Ny aXB0SWQ7CisgICAgdHlwZWRlZiBIYXNoTWFwPGludCwgSW5qZWN0ZWRTY3JpcHQ+IElkVG9Jbmpl Y3RlZFNjcmlwdE1hcDsKICAgICBJZFRvSW5qZWN0ZWRTY3JpcHRNYXAgbV9pZFRvSW5qZWN0ZWRT Y3JpcHQ7CiAgICAgUmVmUHRyPEluamVjdGVkU2NyaXB0SG9zdD4gbV9pbmplY3RlZFNjcmlwdEhv c3Q7CiAgICAgSW5zcGVjdGVkU3RhdGVBY2Nlc3NDaGVjayBtX2luc3BlY3RlZFN0YXRlQWNjZXNz Q2hlY2s7Ci0gICAgdHlwZWRlZiBIYXNoTWFwPFNjcmlwdFN0YXRlKiwgbG9uZz4gU2NyaXB0U3Rh dGVUb0lkOworICAgIHR5cGVkZWYgSGFzaE1hcDxTY3JpcHRTdGF0ZSosIGludD4gU2NyaXB0U3Rh dGVUb0lkOwogICAgIFNjcmlwdFN0YXRlVG9JZCBtX3NjcmlwdFN0YXRlVG9JZDsKIH07CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9QYWdlUnVudGltZUFnZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9QYWdlUnVudGltZUFnZW50LmNwcAppbmRleCAwZDI4 ZjdhMTQzNTJiNjFmOGY0NTk5NmNjZTg1OTliZmEzMGVjM2JiLi5iMjk2MmJkODM4MzQwNjE4ODcw MjgwNzZlZTEyZWE2NTg5ZWEwNTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvUGFnZVJ1bnRpbWVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL1Bh Z2VSdW50aW1lQWdlbnQuY3BwCkBAIC0xNTEsMTAgKzE1MSwxMCBAQCB2b2lkIFBhZ2VSdW50aW1l QWdlbnQ6OnVubXV0ZUNvbnNvbGUoKQogdm9pZCBQYWdlUnVudGltZUFnZW50Ojpub3RpZnlDb250 ZXh0Q3JlYXRlZChjb25zdCBTdHJpbmcmIGZyYW1lSWQsIFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0 ZSwgU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luLCBib29sIGlzUGFnZUNvbnRleHQpCiB7 CiAgICAgQVNTRVJUKHNlY3VyaXR5T3JpZ2luIHx8IGlzUGFnZUNvbnRleHQpOwotICAgIGxvbmcg ZXhlY3V0aW9uQ29udGV4dElkID0gaW5qZWN0ZWRTY3JpcHRNYW5hZ2VyKCktPmluamVjdGVkU2Ny aXB0SWRGb3Ioc2NyaXB0U3RhdGUpOworICAgIGludCBleGVjdXRpb25Db250ZXh0SWQgPSBpbmpl Y3RlZFNjcmlwdE1hbmFnZXIoKS0+aW5qZWN0ZWRTY3JpcHRJZEZvcihzY3JpcHRTdGF0ZSk7CiAg ICAgU3RyaW5nIG5hbWUgPSBzZWN1cml0eU9yaWdpbiA/IHNlY3VyaXR5T3JpZ2luLT50b1N0cmlu ZygpIDogIiI7CiAgICAgbV9mcm9udGVuZC0+aXNvbGF0ZWRDb250ZXh0Q3JlYXRlZChFeGVjdXRp b25Db250ZXh0RGVzY3JpcHRpb246OmNyZWF0ZSgpCi0gICAgICAgIC5zZXRJZChzdGF0aWNfY2Fz dDxpbnQ+KGV4ZWN1dGlvbkNvbnRleHRJZCkpCisgICAgICAgIC5zZXRJZChleGVjdXRpb25Db250 ZXh0SWQpCiAgICAgICAgIC5zZXRJc1BhZ2VDb250ZXh0KGlzUGFnZUNvbnRleHQpCiAgICAgICAg IC5zZXROYW1lKG5hbWUpCiAgICAgICAgIC5zZXRGcmFtZUlkKGZyYW1lSWQpCg==