122942 2013-10-17 00:00:19 -0700 PingLoader objects unnecessarily pass through OwnPtr 2013-11-03 23:08:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan andersca commit-queue darin japhet oldest_to_newest 940659 0 zan 2013-10-17 00:00:19 -0700 PingLoader objects unnecessarily pass through OwnPtr 940666 1 214425 zan 2013-10-17 00:18:10 -0700 Created attachment 214425 Patch 946300 2 214425 darin 2013-11-02 14:16:10 -0700 Comment on attachment 214425 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=214425&action=review OK as is. Room for improvement. > Source/WebCore/loader/PingLoader.cpp:71 > + PingLoader* pingLoader = new PingLoader(frame, request); > + UNUSED_PARAM(pingLoader); I don’t think we need the variable at all. It’s also strange to use UNUSED_PARAM for this. The word is “delete”, not “kill”. Also, I think we should have a helper member function to hide the use of "new". I don’t like having these calls to new with the comments in three different places in the file. It should just be one small inline function. > Source/WebCore/loader/PingLoader.cpp:102 > + // No need to free the PingLoader object or manage it via a smart pointer - it will kill itself as soon as it receives a response. > + PingLoader* pingLoader = new PingLoader(frame, request); > + UNUSED_PARAM(pingLoader); Ditto. > Source/WebCore/loader/PingLoader.cpp:122 > + // No need to free the PingLoader object or manage it via a smart pointer - it will kill itself as soon as it receives a response. > + PingLoader* pingLoader = new PingLoader(frame, request); > + UNUSED_PARAM(pingLoader); Ditto. 946419 3 215859 zan 2013-11-03 02:30:52 -0800 Created attachment 215859 Patch 946428 4 215863 zan 2013-11-03 03:23:03 -0800 Created attachment 215863 Patch 946429 5 215864 zan 2013-11-03 03:55:13 -0800 Created attachment 215864 Patch 946516 6 215864 darin 2013-11-03 16:57:59 -0800 Comment on attachment 215864 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=215864&action=review > Source/WebCore/loader/PingLoader.h:68 > + static inline void createPingLoader(Frame* frame, ResourceRequest& request) > + { > + // No need to free the PingLoader object or manage it via a smart pointer - it will kill itself as soon as it receives a response. > + new PingLoader(frame, request); > + } Since this is in the class definition, the inline keyword is unneeded. Since this is only used in the .cpp file, it need not be in the class definition. I can be in the .cpp file, and just be declared in the class definition. 946543 7 zan 2013-11-03 23:08:15 -0800 Committed r158558: <http://trac.webkit.org/changeset/158558> 214425 2013-10-17 00:18:10 -0700 2013-11-03 02:30:46 -0800 Patch bug-122942-20131017001808.patch text/plain 3939 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3NTIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGM2MDM1NDVjYzVmYjUz NjcyMGRlZWE5YzNhZjhlYTg5ODZhNTBhOC4uNjA5ODEzZTY0NWM3ZmE0MmIzNTUzMjMyZTJlZTZm MzNiZDBlNzI5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTEwLTE3ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBQaW5nTG9hZGVyIG9i amVjdHMgdW5uZWNlc3NhcmlseSBwYXNzIHRocm91Z2ggT3duUHRyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI5NDIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9QUyEpLgorCisgICAgICAgIFN0b3JlIHRoZSBwb2ludGVyIHRvIHRoZSBu ZXcgaGVhcC1hbGxvY2F0ZWQgUGluZ0xvYWRlciBvYmplY3QgZGlyZWN0bHkgaW50byB0aGUgbG9j YWwgbmFrZWQgcG9pbnRlciB2YXJpYWJsZQorICAgICAgICByYXRoZXIgdGhhdCBhZG9wdGluZyB0 aGUgbmV3IG9iamVjdCBpbnRvIGFuIE93blB0ciBhbmQgbGVha2luZyB0aGF0IE93blB0ciBhIGZl dyBsaW5lcyBsYXRlci4KKworICAgICAgICAqIGxvYWRlci9QaW5nTG9hZGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlBpbmdMb2FkZXI6OmxvYWRJbWFnZSk6CisgICAgICAgIChXZWJDb3JlOjpQ aW5nTG9hZGVyOjpzZW5kUGluZyk6CisgICAgICAgIChXZWJDb3JlOjpQaW5nTG9hZGVyOjpzZW5k VmlvbGF0aW9uUmVwb3J0KToKKwogMjAxMy0xMC0xNiAgS3l1bmdUYWUgS2ltICA8a3RmLmtpbUBz YW1zdW5nLmNvbT4KIAogICAgICAgICBEdXJpbmcgZWRpdGluZywgbWVyZ2UgaW5saW5lIHN0eWxl IHdpdGggb3ZlcnJpZGluZyBvdGhlciBhdXRob3Igc3R5bGVzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGlu Z0xvYWRlci5jcHAKaW5kZXggNGIyNDNmNzM5NTc0ODYzNmU0ODFkZWRlMmJkYzFkZDE0MzE4ZWZi Yy4uZDA4M2I1YzFjZjkyYzY2YWFhN2VjYmFjNzhlOGVlMDNkYzZjYjYwNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9QaW5nTG9hZGVyLmNwcApAQCAtNDUsNyArNDUsNiBAQAogI2luY2x1ZGUgIlJlc291 cmNlUmVzcG9uc2UuaCIKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUgIlNl Y3VyaXR5UG9saWN5LmgiCi0jaW5jbHVkZSA8d3RmL093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi90 ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNjYsMTEgKzY1LDEwIEBA IHZvaWQgUGluZ0xvYWRlcjo6bG9hZEltYWdlKEZyYW1lKiBmcmFtZSwgY29uc3QgVVJMJiB1cmwp CiAgICAgaWYgKCFyZWZlcnJlci5pc0VtcHR5KCkpCiAgICAgICAgIHJlcXVlc3Quc2V0SFRUUFJl ZmVycmVyKHJlZmVycmVyKTsKICAgICBmcmFtZS0+bG9hZGVyKCkuYWRkRXh0cmFGaWVsZHNUb1N1 YnJlc291cmNlUmVxdWVzdChyZXF1ZXN0KTsKLSAgICBPd25QdHI8UGluZ0xvYWRlcj4gcGluZ0xv YWRlciA9IGFkb3B0UHRyKG5ldyBQaW5nTG9hZGVyKGZyYW1lLCByZXF1ZXN0KSk7CiAKLSAgICAv LyBMZWFrIHRoZSBwaW5nIGxvYWRlciwgc2luY2UgaXQgd2lsbCBraWxsIGl0c2VsZiBhcyBzb29u IGFzIGl0IHJlY2VpdmVzIGEgcmVzcG9uc2UuCi0gICAgUGluZ0xvYWRlciogbGVha2VkUGluZ0xv YWRlciA9IHBpbmdMb2FkZXIubGVha1B0cigpOwotICAgIFVOVVNFRF9QQVJBTShsZWFrZWRQaW5n TG9hZGVyKTsKKyAgICAvLyBObyBuZWVkIHRvIGZyZWUgdGhlIFBpbmdMb2FkZXIgb2JqZWN0IG9y IG1hbmFnZSBpdCB2aWEgYSBzbWFydCBwb2ludGVyIC0gaXQgd2lsbCBraWxsIGl0c2VsZiBhcyBz b29uIGFzIGl0IHJlY2VpdmVzIGEgcmVzcG9uc2UuCisgICAgUGluZ0xvYWRlciogcGluZ0xvYWRl ciA9IG5ldyBQaW5nTG9hZGVyKGZyYW1lLCByZXF1ZXN0KTsKKyAgICBVTlVTRURfUEFSQU0ocGlu Z0xvYWRlcik7CiB9CiAKIC8vIGh0dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9j dXJyZW50LXdvcmsvbXVsdGlwYWdlL2xpbmtzLmh0bWwjaHlwZXJsaW5rLWF1ZGl0aW5nCkBAIC05 OCwxMSArOTYsMTAgQEAgdm9pZCBQaW5nTG9hZGVyOjpzZW5kUGluZyhGcmFtZSogZnJhbWUsIGNv bnN0IFVSTCYgcGluZ1VSTCwgY29uc3QgVVJMJiBkZXN0aW5hdGkKICAgICAgICAgICAgICAgICBy ZXF1ZXN0LnNldEhUVFBSZWZlcnJlcihyZWZlcnJlcik7CiAgICAgICAgIH0KICAgICB9Ci0gICAg T3duUHRyPFBpbmdMb2FkZXI+IHBpbmdMb2FkZXIgPSBhZG9wdFB0cihuZXcgUGluZ0xvYWRlcihm cmFtZSwgcmVxdWVzdCkpOwogCi0gICAgLy8gTGVhayB0aGUgcGluZyBsb2FkZXIsIHNpbmNlIGl0 IHdpbGwga2lsbCBpdHNlbGYgYXMgc29vbiBhcyBpdCByZWNlaXZlcyBhIHJlc3BvbnNlLgotICAg IFBpbmdMb2FkZXIqIGxlYWtlZFBpbmdMb2FkZXIgPSBwaW5nTG9hZGVyLmxlYWtQdHIoKTsKLSAg ICBVTlVTRURfUEFSQU0obGVha2VkUGluZ0xvYWRlcik7CisgICAgLy8gTm8gbmVlZCB0byBmcmVl IHRoZSBQaW5nTG9hZGVyIG9iamVjdCBvciBtYW5hZ2UgaXQgdmlhIGEgc21hcnQgcG9pbnRlciAt IGl0IHdpbGwga2lsbCBpdHNlbGYgYXMgc29vbiBhcyBpdCByZWNlaXZlcyBhIHJlc3BvbnNlLgor ICAgIFBpbmdMb2FkZXIqIHBpbmdMb2FkZXIgPSBuZXcgUGluZ0xvYWRlcihmcmFtZSwgcmVxdWVz dCk7CisgICAgVU5VU0VEX1BBUkFNKHBpbmdMb2FkZXIpOwogfQogCiB2b2lkIFBpbmdMb2FkZXI6 OnNlbmRWaW9sYXRpb25SZXBvcnQoRnJhbWUqIGZyYW1lLCBjb25zdCBVUkwmIHJlcG9ydFVSTCwg UGFzc1JlZlB0cjxGb3JtRGF0YT4gcmVwb3J0KQpAQCAtMTE5LDExICsxMTYsMTAgQEAgdm9pZCBQ aW5nTG9hZGVyOjpzZW5kVmlvbGF0aW9uUmVwb3J0KEZyYW1lKiBmcmFtZSwgY29uc3QgVVJMJiBy ZXBvcnRVUkwsIFBhc3NSZWYKICAgICBTdHJpbmcgcmVmZXJyZXIgPSBTZWN1cml0eVBvbGljeTo6 Z2VuZXJhdGVSZWZlcnJlckhlYWRlcihmcmFtZS0+ZG9jdW1lbnQoKS0+cmVmZXJyZXJQb2xpY3ko KSwgcmVwb3J0VVJMLCBmcmFtZS0+bG9hZGVyKCkub3V0Z29pbmdSZWZlcnJlcigpKTsKICAgICBp ZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkKICAgICAgICAgcmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIo cmVmZXJyZXIpOwotICAgIE93blB0cjxQaW5nTG9hZGVyPiBwaW5nTG9hZGVyID0gYWRvcHRQdHIo bmV3IFBpbmdMb2FkZXIoZnJhbWUsIHJlcXVlc3QpKTsKIAotICAgIC8vIExlYWsgdGhlIHBpbmcg bG9hZGVyLCBzaW5jZSBpdCB3aWxsIGtpbGwgaXRzZWxmIGFzIHNvb24gYXMgaXQgcmVjZWl2ZXMg YSByZXNwb25zZS4KLSAgICBQaW5nTG9hZGVyKiBsZWFrZWRQaW5nTG9hZGVyID0gcGluZ0xvYWRl ci5sZWFrUHRyKCk7Ci0gICAgVU5VU0VEX1BBUkFNKGxlYWtlZFBpbmdMb2FkZXIpOworICAgIC8v IE5vIG5lZWQgdG8gZnJlZSB0aGUgUGluZ0xvYWRlciBvYmplY3Qgb3IgbWFuYWdlIGl0IHZpYSBh IHNtYXJ0IHBvaW50ZXIgLSBpdCB3aWxsIGtpbGwgaXRzZWxmIGFzIHNvb24gYXMgaXQgcmVjZWl2 ZXMgYSByZXNwb25zZS4KKyAgICBQaW5nTG9hZGVyKiBwaW5nTG9hZGVyID0gbmV3IFBpbmdMb2Fk ZXIoZnJhbWUsIHJlcXVlc3QpOworICAgIFVOVVNFRF9QQVJBTShwaW5nTG9hZGVyKTsKIH0KIAog UGluZ0xvYWRlcjo6UGluZ0xvYWRlcihGcmFtZSogZnJhbWUsIFJlc291cmNlUmVxdWVzdCYgcmVx dWVzdCkK 215859 2013-11-03 02:30:52 -0800 2013-11-03 02:32:51 -0800 Patch bug-122942-20131103023051.patch text/plain 4174 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODUyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTExLTAzICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBQaW5nTG9hZGVyIG9iamVj dHMgdW5uZWNlc3NhcmlseSBwYXNzIHRocm91Z2ggT3duUHRyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI5NDIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9QUyEpLgorCisgICAgICAgIFRoZXJlJ3Mgbm8gbmVlZCB0byBzdG9yZSBuZXcg UGluZ0xvYWRlciBvYmplY3RzIGludG8gYW4gT3duUHRyIGp1c3QgdG8gbGVhayB0aGVtIG91dCBh IGZldyBsaW5lcyBsYXRlcgorICAgICAgICBpbnRvIGFuIHVudXNlZCB2YXJpYWJsZS4gTmV3IG9i amVjdHMgYXJlIGNyZWF0ZWQgdGhyb3VnaCBhIG5ldyBoZWxwZXIgbWV0aG9kIGFuZCB0aGVuIGxl ZnQgdW5tYW5hZ2VkIGFzCisgICAgICAgIHRoZXkncmUgZ3VhcmFudGVlZCB0byBkZXN0cm95IHRo ZW1zZWx2ZXMgd2hlbiB0aGV5IHJlY2VpdmUgYSByZXNwb25zZSBvZiBhbnkga2luZC4KKworICAg ICAgICAqIGxvYWRlci9QaW5nTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBpbmdMb2Fk ZXI6OmxvYWRJbWFnZSk6IENhbGwgdGhlIG5ldyBjcmVhdGVQaW5nTG9hZGVyIG1ldGhvZCB0byBz cGF3biB0aGUgUGluZ0xvYWRlci4KKyAgICAgICAgKFdlYkNvcmU6OlBpbmdMb2FkZXI6OnNlbmRQ aW5nKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpQaW5nTG9hZGVyOjpzZW5kVmlvbGF0aW9u UmVwb3J0KTogRGl0dG8uCisgICAgICAgICogbG9hZGVyL1BpbmdMb2FkZXIuaDoKKyAgICAgICAg KFdlYkNvcmU6OlBpbmdMb2FkZXI6OmNyZWF0ZVBpbmdMb2FkZXIpOiBBIGhlbHBlciBpbmxpbmUg bWV0aG9kIHRoYXQgY3JlYXRlcyBhIG5ldyBQaW5nTG9hZGVyIG9iamVjdAorCiAyMDEzLTExLTAz ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBJbmxpbmUgUmVu ZGVyU3R5bGUgZnVuY3Rpb25zIGZvciBnZXR0aW5nL3NldHRpbmcgcHNldWRvIHN0eWxlIGJpdHMu CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3BwCShyZXZpc2lvbiAxNTg1Mjkp CisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ1LDcgKzQ1LDYgQEAKICNpbmNsdWRlICJSZXNvdXJjZVJlc3BvbnNlLmgiCiAjaW5jbHVk ZSAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJTZWN1cml0eVBvbGljeS5oIgotI2luY2x1 ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKQEAgLTY2LDExICs2NSw4IEBAIHZvaWQgUGluZ0xvYWRlcjo6bG9hZElt YWdlKEZyYW1lKiBmcmFtZSwKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkKICAgICAgICAg cmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIocmVmZXJyZXIpOwogICAgIGZyYW1lLT5sb2FkZXIoKS5h ZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpOwotICAgIE93blB0cjxQ aW5nTG9hZGVyPiBwaW5nTG9hZGVyID0gYWRvcHRQdHIobmV3IFBpbmdMb2FkZXIoZnJhbWUsIHJl cXVlc3QpKTsKIAotICAgIC8vIExlYWsgdGhlIHBpbmcgbG9hZGVyLCBzaW5jZSBpdCB3aWxsIGtp bGwgaXRzZWxmIGFzIHNvb24gYXMgaXQgcmVjZWl2ZXMgYSByZXNwb25zZS4KLSAgICBQaW5nTG9h ZGVyKiBsZWFrZWRQaW5nTG9hZGVyID0gcGluZ0xvYWRlci5sZWFrUHRyKCk7Ci0gICAgVU5VU0VE X1BBUkFNKGxlYWtlZFBpbmdMb2FkZXIpOworICAgIGNyZWF0ZVBpbmdMb2FkZXIoZnJhbWUsIHJl cXVlc3QpOwogfQogCiAvLyBodHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3Vy cmVudC13b3JrL211bHRpcGFnZS9saW5rcy5odG1sI2h5cGVybGluay1hdWRpdGluZwpAQCAtOTgs MTEgKzk0LDggQEAgdm9pZCBQaW5nTG9hZGVyOjpzZW5kUGluZyhGcmFtZSogZnJhbWUsCiAgICAg ICAgICAgICAgICAgcmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIocmVmZXJyZXIpOwogICAgICAgICB9 CiAgICAgfQotICAgIE93blB0cjxQaW5nTG9hZGVyPiBwaW5nTG9hZGVyID0gYWRvcHRQdHIobmV3 IFBpbmdMb2FkZXIoZnJhbWUsIHJlcXVlc3QpKTsKIAotICAgIC8vIExlYWsgdGhlIHBpbmcgbG9h ZGVyLCBzaW5jZSBpdCB3aWxsIGtpbGwgaXRzZWxmIGFzIHNvb24gYXMgaXQgcmVjZWl2ZXMgYSBy ZXNwb25zZS4KLSAgICBQaW5nTG9hZGVyKiBsZWFrZWRQaW5nTG9hZGVyID0gcGluZ0xvYWRlci5s ZWFrUHRyKCk7Ci0gICAgVU5VU0VEX1BBUkFNKGxlYWtlZFBpbmdMb2FkZXIpOworICAgIGNyZWF0 ZVBpbmdMb2FkZXIoZnJhbWUsIHJlcXVlc3QpOwogfQogCiB2b2lkIFBpbmdMb2FkZXI6OnNlbmRW aW9sYXRpb25SZXBvcnQoRnJhbWUqIGZyYW1lLCBjb25zdCBVUkwmIHJlcG9ydFVSTCwgUGFzc1Jl ZlB0cjxGb3JtRGF0YT4gcmVwb3J0KQpAQCAtMTE5LDExICsxMTIsOCBAQCB2b2lkIFBpbmdMb2Fk ZXI6OnNlbmRWaW9sYXRpb25SZXBvcnQoRnJhCiAgICAgU3RyaW5nIHJlZmVycmVyID0gU2VjdXJp dHlQb2xpY3k6OmdlbmVyYXRlUmVmZXJyZXJIZWFkZXIoZnJhbWUtPmRvY3VtZW50KCktPnJlZmVy cmVyUG9saWN5KCksIHJlcG9ydFVSTCwgZnJhbWUtPmxvYWRlcigpLm91dGdvaW5nUmVmZXJyZXIo KSk7CiAgICAgaWYgKCFyZWZlcnJlci5pc0VtcHR5KCkpCiAgICAgICAgIHJlcXVlc3Quc2V0SFRU UFJlZmVycmVyKHJlZmVycmVyKTsKLSAgICBPd25QdHI8UGluZ0xvYWRlcj4gcGluZ0xvYWRlciA9 IGFkb3B0UHRyKG5ldyBQaW5nTG9hZGVyKGZyYW1lLCByZXF1ZXN0KSk7CiAKLSAgICAvLyBMZWFr IHRoZSBwaW5nIGxvYWRlciwgc2luY2UgaXQgd2lsbCBraWxsIGl0c2VsZiBhcyBzb29uIGFzIGl0 IHJlY2VpdmVzIGEgcmVzcG9uc2UuCi0gICAgUGluZ0xvYWRlciogbGVha2VkUGluZ0xvYWRlciA9 IHBpbmdMb2FkZXIubGVha1B0cigpOwotICAgIFVOVVNFRF9QQVJBTShsZWFrZWRQaW5nTG9hZGVy KTsKKyAgICBjcmVhdGVQaW5nTG9hZGVyKGZyYW1lLCByZXF1ZXN0KTsKIH0KIAogUGluZ0xvYWRl cjo6UGluZ0xvYWRlcihGcmFtZSogZnJhbWUsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVyLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuaAkocmV2aXNpb24gMTU4NTI5KQorKysgU291 cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNiAr NjEsMTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwgflBpbmdMb2FkZXIoKTsKIAogcHJpdmF0ZToK KyAgICBzdGF0aWMgaW5saW5lIHZvaWQgY3JlYXRlUGluZ0xvYWRlcihGcmFtZSosIFJlc291cmNl UmVxdWVzdCYpCisgICAgeworICAgICAgICAvLyBObyBuZWVkIHRvIGZyZWUgdGhlIFBpbmdMb2Fk ZXIgb2JqZWN0IG9yIG1hbmFnZSBpdCB2aWEgYSBzbWFydCBwb2ludGVyIC0gaXQgd2lsbCBraWxs IGl0c2VsZiBhcyBzb29uIGFzIGl0IHJlY2VpdmVzIGEgcmVzcG9uc2UuCisgICAgICAgIG5ldyBQ aW5nTG9hZGVyKGZyYW1lLCByZXF1ZXN0KTsKKyAgICB9CiAgICAgUGluZ0xvYWRlcihGcmFtZSos IFJlc291cmNlUmVxdWVzdCYpOwogCiAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVSZXNwb25z ZShSZXNvdXJjZUhhbmRsZSosIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKSBPVkVSUklERSB7IGRl bGV0ZSB0aGlzOyB9Cg== 215863 2013-11-03 03:23:03 -0800 2013-11-03 03:55:07 -0800 Patch bug-122942-20131103032301.patch text/plain 4188 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODUyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTExLTAzICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBQaW5nTG9hZGVyIG9iamVj dHMgdW5uZWNlc3NhcmlseSBwYXNzIHRocm91Z2ggT3duUHRyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI5NDIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9QUyEpLgorCisgICAgICAgIFRoZXJlJ3Mgbm8gbmVlZCB0byBzdG9yZSBuZXcg UGluZ0xvYWRlciBvYmplY3RzIGludG8gYW4gT3duUHRyIGp1c3QgdG8gbGVhayB0aGVtIG91dCBh IGZldyBsaW5lcyBsYXRlcgorICAgICAgICBpbnRvIGFuIHVudXNlZCB2YXJpYWJsZS4gTmV3IG9i amVjdHMgYXJlIGNyZWF0ZWQgdGhyb3VnaCBhIG5ldyBoZWxwZXIgbWV0aG9kIGFuZCB0aGVuIGxl ZnQgdW5tYW5hZ2VkIGFzCisgICAgICAgIHRoZXkncmUgZ3VhcmFudGVlZCB0byBkZXN0cm95IHRo ZW1zZWx2ZXMgd2hlbiB0aGV5IHJlY2VpdmUgYSByZXNwb25zZSBvZiBhbnkga2luZC4KKworICAg ICAgICAqIGxvYWRlci9QaW5nTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBpbmdMb2Fk ZXI6OmxvYWRJbWFnZSk6IENhbGwgdGhlIG5ldyBjcmVhdGVQaW5nTG9hZGVyIG1ldGhvZCB0byBz cGF3biB0aGUgUGluZ0xvYWRlci4KKyAgICAgICAgKFdlYkNvcmU6OlBpbmdMb2FkZXI6OnNlbmRQ aW5nKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpQaW5nTG9hZGVyOjpzZW5kVmlvbGF0aW9u UmVwb3J0KTogRGl0dG8uCisgICAgICAgICogbG9hZGVyL1BpbmdMb2FkZXIuaDoKKyAgICAgICAg KFdlYkNvcmU6OlBpbmdMb2FkZXI6OmNyZWF0ZVBpbmdMb2FkZXIpOiBBIGhlbHBlciBpbmxpbmUg bWV0aG9kIHRoYXQgY3JlYXRlcyBhIG5ldyBQaW5nTG9hZGVyIG9iamVjdAorCiAyMDEzLTExLTAz ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBJbmxpbmUgUmVu ZGVyU3R5bGUgZnVuY3Rpb25zIGZvciBnZXR0aW5nL3NldHRpbmcgcHNldWRvIHN0eWxlIGJpdHMu CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuY3BwCShyZXZpc2lvbiAxNTg1Mjkp CisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ1LDcgKzQ1LDYgQEAKICNpbmNsdWRlICJSZXNvdXJjZVJlc3BvbnNlLmgiCiAjaW5jbHVk ZSAiU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJTZWN1cml0eVBvbGljeS5oIgotI2luY2x1 ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKQEAgLTY2LDExICs2NSw4IEBAIHZvaWQgUGluZ0xvYWRlcjo6bG9hZElt YWdlKEZyYW1lKiBmcmFtZSwKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkKICAgICAgICAg cmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIocmVmZXJyZXIpOwogICAgIGZyYW1lLT5sb2FkZXIoKS5h ZGRFeHRyYUZpZWxkc1RvU3VicmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpOwotICAgIE93blB0cjxQ aW5nTG9hZGVyPiBwaW5nTG9hZGVyID0gYWRvcHRQdHIobmV3IFBpbmdMb2FkZXIoZnJhbWUsIHJl cXVlc3QpKTsKIAotICAgIC8vIExlYWsgdGhlIHBpbmcgbG9hZGVyLCBzaW5jZSBpdCB3aWxsIGtp bGwgaXRzZWxmIGFzIHNvb24gYXMgaXQgcmVjZWl2ZXMgYSByZXNwb25zZS4KLSAgICBQaW5nTG9h ZGVyKiBsZWFrZWRQaW5nTG9hZGVyID0gcGluZ0xvYWRlci5sZWFrUHRyKCk7Ci0gICAgVU5VU0VE X1BBUkFNKGxlYWtlZFBpbmdMb2FkZXIpOworICAgIGNyZWF0ZVBpbmdMb2FkZXIoZnJhbWUsIHJl cXVlc3QpOwogfQogCiAvLyBodHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3Vy cmVudC13b3JrL211bHRpcGFnZS9saW5rcy5odG1sI2h5cGVybGluay1hdWRpdGluZwpAQCAtOTgs MTEgKzk0LDggQEAgdm9pZCBQaW5nTG9hZGVyOjpzZW5kUGluZyhGcmFtZSogZnJhbWUsCiAgICAg ICAgICAgICAgICAgcmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIocmVmZXJyZXIpOwogICAgICAgICB9 CiAgICAgfQotICAgIE93blB0cjxQaW5nTG9hZGVyPiBwaW5nTG9hZGVyID0gYWRvcHRQdHIobmV3 IFBpbmdMb2FkZXIoZnJhbWUsIHJlcXVlc3QpKTsKIAotICAgIC8vIExlYWsgdGhlIHBpbmcgbG9h ZGVyLCBzaW5jZSBpdCB3aWxsIGtpbGwgaXRzZWxmIGFzIHNvb24gYXMgaXQgcmVjZWl2ZXMgYSBy ZXNwb25zZS4KLSAgICBQaW5nTG9hZGVyKiBsZWFrZWRQaW5nTG9hZGVyID0gcGluZ0xvYWRlci5s ZWFrUHRyKCk7Ci0gICAgVU5VU0VEX1BBUkFNKGxlYWtlZFBpbmdMb2FkZXIpOworICAgIGNyZWF0 ZVBpbmdMb2FkZXIoZnJhbWUsIHJlcXVlc3QpOwogfQogCiB2b2lkIFBpbmdMb2FkZXI6OnNlbmRW aW9sYXRpb25SZXBvcnQoRnJhbWUqIGZyYW1lLCBjb25zdCBVUkwmIHJlcG9ydFVSTCwgUGFzc1Jl ZlB0cjxGb3JtRGF0YT4gcmVwb3J0KQpAQCAtMTE5LDExICsxMTIsOCBAQCB2b2lkIFBpbmdMb2Fk ZXI6OnNlbmRWaW9sYXRpb25SZXBvcnQoRnJhCiAgICAgU3RyaW5nIHJlZmVycmVyID0gU2VjdXJp dHlQb2xpY3k6OmdlbmVyYXRlUmVmZXJyZXJIZWFkZXIoZnJhbWUtPmRvY3VtZW50KCktPnJlZmVy cmVyUG9saWN5KCksIHJlcG9ydFVSTCwgZnJhbWUtPmxvYWRlcigpLm91dGdvaW5nUmVmZXJyZXIo KSk7CiAgICAgaWYgKCFyZWZlcnJlci5pc0VtcHR5KCkpCiAgICAgICAgIHJlcXVlc3Quc2V0SFRU UFJlZmVycmVyKHJlZmVycmVyKTsKLSAgICBPd25QdHI8UGluZ0xvYWRlcj4gcGluZ0xvYWRlciA9 IGFkb3B0UHRyKG5ldyBQaW5nTG9hZGVyKGZyYW1lLCByZXF1ZXN0KSk7CiAKLSAgICAvLyBMZWFr IHRoZSBwaW5nIGxvYWRlciwgc2luY2UgaXQgd2lsbCBraWxsIGl0c2VsZiBhcyBzb29uIGFzIGl0 IHJlY2VpdmVzIGEgcmVzcG9uc2UuCi0gICAgUGluZ0xvYWRlciogbGVha2VkUGluZ0xvYWRlciA9 IHBpbmdMb2FkZXIubGVha1B0cigpOwotICAgIFVOVVNFRF9QQVJBTShsZWFrZWRQaW5nTG9hZGVy KTsKKyAgICBjcmVhdGVQaW5nTG9hZGVyKGZyYW1lLCByZXF1ZXN0KTsKIH0KIAogUGluZ0xvYWRl cjo6UGluZ0xvYWRlcihGcmFtZSogZnJhbWUsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVyLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuaAkocmV2aXNpb24gMTU4NTI5KQorKysgU291 cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsNiAr NjEsMTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwgflBpbmdMb2FkZXIoKTsKIAogcHJpdmF0ZToK KyAgICBzdGF0aWMgaW5saW5lIHZvaWQgY3JlYXRlUGluZ0xvYWRlcihGcmFtZSogZnJhbWUsIFJl c291cmNlUmVxdWVzdCYgcmVxdWVzdCkKKyAgICB7CisgICAgICAgIC8vIE5vIG5lZWQgdG8gZnJl ZSB0aGUgUGluZ0xvYWRlciBvYmplY3Qgb3IgbWFuYWdlIGl0IHZpYSBhIHNtYXJ0IHBvaW50ZXIg LSBpdCB3aWxsIGtpbGwgaXRzZWxmIGFzIHNvb24gYXMgaXQgcmVjZWl2ZXMgYSByZXNwb25zZS4K KyAgICAgICAgbmV3IFBpbmdMb2FkZXIoZnJhbWUsIHJlcXVlc3QpOworICAgIH0KICAgICBQaW5n TG9hZGVyKEZyYW1lKiwgUmVzb3VyY2VSZXF1ZXN0Jik7CiAKICAgICB2aXJ0dWFsIHZvaWQgZGlk UmVjZWl2ZVJlc3BvbnNlKFJlc291cmNlSGFuZGxlKiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYp IE9WRVJSSURFIHsgZGVsZXRlIHRoaXM7IH0K 215864 2013-11-03 03:55:13 -0800 2013-11-03 16:57:59 -0800 Patch bug-122942-20131103035512.patch text/plain 4187 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODUzMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTExLTAzICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBQaW5nTG9hZGVyIG9iamVj dHMgdW5uZWNlc3NhcmlseSBwYXNzIHRocm91Z2ggT3duUHRyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI5NDIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGVyZSdzIG5vIG5lZWQgdG8gc3RvcmUgbmV3 IFBpbmdMb2FkZXIgb2JqZWN0cyBpbnRvIGFuIE93blB0ciBqdXN0IHRvIGxlYWsgdGhlbSBvdXQg YSBmZXcgbGluZXMgbGF0ZXIKKyAgICAgICAgaW50byBhbiB1bnVzZWQgdmFyaWFibGUuIE5ldyBv YmplY3RzIGFyZSBjcmVhdGVkIHRocm91Z2ggYSBuZXcgaGVscGVyIG1ldGhvZCBhbmQgdGhlbiBs ZWZ0IHVubWFuYWdlZCBhcworICAgICAgICB0aGV5J3JlIGd1YXJhbnRlZWQgdG8gZGVzdHJveSB0 aGVtc2VsdmVzIHdoZW4gdGhleSByZWNlaXZlIGEgcmVzcG9uc2Ugb2YgYW55IGtpbmQuCisKKyAg ICAgICAgKiBsb2FkZXIvUGluZ0xvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQaW5nTG9h ZGVyOjpsb2FkSW1hZ2UpOiBDYWxsIHRoZSBuZXcgY3JlYXRlUGluZ0xvYWRlciBtZXRob2QgdG8g c3Bhd24gdGhlIFBpbmdMb2FkZXIuCisgICAgICAgIChXZWJDb3JlOjpQaW5nTG9hZGVyOjpzZW5k UGluZyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UGluZ0xvYWRlcjo6c2VuZFZpb2xhdGlv blJlcG9ydCk6IERpdHRvLgorICAgICAgICAqIGxvYWRlci9QaW5nTG9hZGVyLmg6CisgICAgICAg IChXZWJDb3JlOjpQaW5nTG9hZGVyOjpjcmVhdGVQaW5nTG9hZGVyKTogQSBoZWxwZXIgaW5saW5l IG1ldGhvZCB0aGF0IGNyZWF0ZXMgYSBuZXcgUGluZ0xvYWRlciBvYmplY3QKKwogMjAxMy0xMS0w MyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGhlbHBl cnMgZm9yIHBhcnRpYWwgZGVzY2VuZGFudCB0cmF2ZXJzYWwgdG8gZWxlbWVudCBpdGVyYXRvcnMK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5jcHAJKHJldmlzaW9uIDE1ODUyOSkK KysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9QaW5nTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDUsNyArNDUsNiBAQAogI2luY2x1ZGUgIlJlc291cmNlUmVzcG9uc2UuaCIKICNpbmNsdWRl ICJTZWN1cml0eU9yaWdpbi5oIgogI2luY2x1ZGUgIlNlY3VyaXR5UG9saWN5LmgiCi0jaW5jbHVk ZSA8d3RmL093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFtZXNw YWNlIFdlYkNvcmUgewpAQCAtNjYsMTEgKzY1LDggQEAgdm9pZCBQaW5nTG9hZGVyOjpsb2FkSW1h Z2UoRnJhbWUqIGZyYW1lLAogICAgIGlmICghcmVmZXJyZXIuaXNFbXB0eSgpKQogICAgICAgICBy ZXF1ZXN0LnNldEhUVFBSZWZlcnJlcihyZWZlcnJlcik7CiAgICAgZnJhbWUtPmxvYWRlcigpLmFk ZEV4dHJhRmllbGRzVG9TdWJyZXNvdXJjZVJlcXVlc3QocmVxdWVzdCk7Ci0gICAgT3duUHRyPFBp bmdMb2FkZXI+IHBpbmdMb2FkZXIgPSBhZG9wdFB0cihuZXcgUGluZ0xvYWRlcihmcmFtZSwgcmVx dWVzdCkpOwogCi0gICAgLy8gTGVhayB0aGUgcGluZyBsb2FkZXIsIHNpbmNlIGl0IHdpbGwga2ls bCBpdHNlbGYgYXMgc29vbiBhcyBpdCByZWNlaXZlcyBhIHJlc3BvbnNlLgotICAgIFBpbmdMb2Fk ZXIqIGxlYWtlZFBpbmdMb2FkZXIgPSBwaW5nTG9hZGVyLmxlYWtQdHIoKTsKLSAgICBVTlVTRURf UEFSQU0obGVha2VkUGluZ0xvYWRlcik7CisgICAgY3JlYXRlUGluZ0xvYWRlcihmcmFtZSwgcmVx dWVzdCk7CiB9CiAKIC8vIGh0dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBwcy9jdXJy ZW50LXdvcmsvbXVsdGlwYWdlL2xpbmtzLmh0bWwjaHlwZXJsaW5rLWF1ZGl0aW5nCkBAIC05OCwx MSArOTQsOCBAQCB2b2lkIFBpbmdMb2FkZXI6OnNlbmRQaW5nKEZyYW1lKiBmcmFtZSwKICAgICAg ICAgICAgICAgICByZXF1ZXN0LnNldEhUVFBSZWZlcnJlcihyZWZlcnJlcik7CiAgICAgICAgIH0K ICAgICB9Ci0gICAgT3duUHRyPFBpbmdMb2FkZXI+IHBpbmdMb2FkZXIgPSBhZG9wdFB0cihuZXcg UGluZ0xvYWRlcihmcmFtZSwgcmVxdWVzdCkpOwogCi0gICAgLy8gTGVhayB0aGUgcGluZyBsb2Fk ZXIsIHNpbmNlIGl0IHdpbGwga2lsbCBpdHNlbGYgYXMgc29vbiBhcyBpdCByZWNlaXZlcyBhIHJl c3BvbnNlLgotICAgIFBpbmdMb2FkZXIqIGxlYWtlZFBpbmdMb2FkZXIgPSBwaW5nTG9hZGVyLmxl YWtQdHIoKTsKLSAgICBVTlVTRURfUEFSQU0obGVha2VkUGluZ0xvYWRlcik7CisgICAgY3JlYXRl UGluZ0xvYWRlcihmcmFtZSwgcmVxdWVzdCk7CiB9CiAKIHZvaWQgUGluZ0xvYWRlcjo6c2VuZFZp b2xhdGlvblJlcG9ydChGcmFtZSogZnJhbWUsIGNvbnN0IFVSTCYgcmVwb3J0VVJMLCBQYXNzUmVm UHRyPEZvcm1EYXRhPiByZXBvcnQpCkBAIC0xMTksMTEgKzExMiw4IEBAIHZvaWQgUGluZ0xvYWRl cjo6c2VuZFZpb2xhdGlvblJlcG9ydChGcmEKICAgICBTdHJpbmcgcmVmZXJyZXIgPSBTZWN1cml0 eVBvbGljeTo6Z2VuZXJhdGVSZWZlcnJlckhlYWRlcihmcmFtZS0+ZG9jdW1lbnQoKS0+cmVmZXJy ZXJQb2xpY3koKSwgcmVwb3J0VVJMLCBmcmFtZS0+bG9hZGVyKCkub3V0Z29pbmdSZWZlcnJlcigp KTsKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkKICAgICAgICAgcmVxdWVzdC5zZXRIVFRQ UmVmZXJyZXIocmVmZXJyZXIpOwotICAgIE93blB0cjxQaW5nTG9hZGVyPiBwaW5nTG9hZGVyID0g YWRvcHRQdHIobmV3IFBpbmdMb2FkZXIoZnJhbWUsIHJlcXVlc3QpKTsKIAotICAgIC8vIExlYWsg dGhlIHBpbmcgbG9hZGVyLCBzaW5jZSBpdCB3aWxsIGtpbGwgaXRzZWxmIGFzIHNvb24gYXMgaXQg cmVjZWl2ZXMgYSByZXNwb25zZS4KLSAgICBQaW5nTG9hZGVyKiBsZWFrZWRQaW5nTG9hZGVyID0g cGluZ0xvYWRlci5sZWFrUHRyKCk7Ci0gICAgVU5VU0VEX1BBUkFNKGxlYWtlZFBpbmdMb2FkZXIp OworICAgIGNyZWF0ZVBpbmdMb2FkZXIoZnJhbWUsIHJlcXVlc3QpOwogfQogCiBQaW5nTG9hZGVy OjpQaW5nTG9hZGVyKEZyYW1lKiBmcmFtZSwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQpJbmRl eDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1BpbmdMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5oCShyZXZpc2lvbiAxNTg1MjkpCisrKyBTb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUGluZ0xvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2 MSwxMSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB+UGluZ0xvYWRlcigpOwogCiBwcml2YXRlOgor ICAgIHN0YXRpYyBpbmxpbmUgdm9pZCBjcmVhdGVQaW5nTG9hZGVyKEZyYW1lKiBmcmFtZSwgUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQorICAgIHsKKyAgICAgICAgLy8gTm8gbmVlZCB0byBmcmVl IHRoZSBQaW5nTG9hZGVyIG9iamVjdCBvciBtYW5hZ2UgaXQgdmlhIGEgc21hcnQgcG9pbnRlciAt IGl0IHdpbGwga2lsbCBpdHNlbGYgYXMgc29vbiBhcyBpdCByZWNlaXZlcyBhIHJlc3BvbnNlLgor ICAgICAgICBuZXcgUGluZ0xvYWRlcihmcmFtZSwgcmVxdWVzdCk7CisgICAgfQogICAgIFBpbmdM b2FkZXIoRnJhbWUqLCBSZXNvdXJjZVJlcXVlc3QmKTsKIAogICAgIHZpcnR1YWwgdm9pZCBkaWRS ZWNlaXZlUmVzcG9uc2UoUmVzb3VyY2VIYW5kbGUqLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJikg T1ZFUlJJREUgeyBkZWxldGUgdGhpczsgfQo=