130803 2014-03-26 15:25:12 -0700 Web Inspector: Modernize the loops in InspectorPageAgent.cpp 2014-03-26 16:58:45 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 timothy timothy commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 994727 0 timothy 2014-03-26 15:25:12 -0700 C++11 FTW! 994728 1 227891 timothy 2014-03-26 15:26:52 -0700 Created attachment 227891 Patch 994734 2 227891 joepeck 2014-03-26 15:40:17 -0700 Comment on attachment 227891 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227891&action=review > Source/WebCore/inspector/InspectorPageAgent.cpp:455 > + for (auto cookie : cookiesList) > + cookies->addItem(buildObjectForCookie(cookie)); I think we are making these new for loops either "auto*" or "auto&" to be explicit. 994736 3 227894 timothy 2014-03-26 15:47:30 -0700 Created attachment 227894 Patch 994737 4 227894 joepeck 2014-03-26 15:52:53 -0700 Comment on attachment 227894 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227894&action=review r=me > Source/WebCore/inspector/InspectorPageAgent.cpp:465 > + auto cachedResource = cachedResourceHandle.get(); I think having CachedResource* here would be helpful instead of auto. 994740 5 227896 timothy 2014-03-26 16:20:40 -0700 Created attachment 227896 Patch 994754 6 227896 commit-queue 2014-03-26 16:58:42 -0700 Comment on attachment 227896 Patch Clearing flags on attachment: 227896 Committed r166329: <http://trac.webkit.org/changeset/166329> 994755 7 commit-queue 2014-03-26 16:58:45 -0700 All reviewed patches have been landed. Closing bug. 227891 2014-03-26 15:26:52 -0700 2014-03-26 15:47:27 -0700 Patch bug-130803-20140326152631.patch text/plain 7762 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFkZTc5ZGRhYzlmY2U5 Y2EyNDU0NmI1NTE0MTAzYTM5MWM0NTc0ZC4uMDlmNWFlZDcxZTM0ZTZlZDJkNzE1YzdmYjQ3MDJl NWZkYjQ4NTkyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAzLTI2ICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBNb2Rlcm5pemUgdGhl IGxvb3BzIGluIEluc3BlY3RvclBhZ2VBZ2VudC5jcHAuCisKKyAgICAgICAgQWxzbyBtb3ZlcyB0 aGUgY2hlY2sgZm9yIGhpZGRlbkZyb21JbnNwZWN0b3IgdG8gYSBsb3dlciBsZXZlbC4KKyAgICAg ICAgVGhpcyBoaWRlcyBoaWRkZW4gcmVzb3VyY2UgZnJvbSBtb3JlIHBsYWNlcy4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwODAzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5z cGVjdG9yUGFnZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkQXJyYXlGb3JDb29r aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OmNhY2hlZFJlc291cmNlc0ZvckZyYW1lKToKKyAgICAg ICAgKFdlYkNvcmU6OmFsbFJlc291cmNlc1VSTHNGb3JGcmFtZSk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JQYWdlQWdlbnQ6OmdldENvb2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yUGFnZUFnZW50OjpzZWFyY2hJblJlc291cmNlcyk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JQYWdlQWdlbnQ6OmRpZENsZWFyV2luZG93T2JqZWN0SW5Xb3JsZCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OmxvYWRlckRldGFjaGVkRnJvbUZyYW1lKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6YnVpbGRPYmplY3RGb3JGcmFt ZVRyZWUpOgorCiAyMDE0LTAzLTI1ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNv bT4KIAogICAgICAgICBQcm9wYWdhdGUgdGhlIGhpZGRlbkZyb21JbnNwZWN0b3IgZmxhZyBvbiBS ZXNvdXJjZVJlcXVlc3QgaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JQYWdlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clBhZ2VBZ2VudC5jcHAKaW5kZXggNjc2ZGE1OTQzYTczZDhkMWUzZTJkY2MzMjgzZjM5OTg2ZTE5 ZmMxMS4uYTY1MzlhYWQ3ZjRiOTljZTgxNjc3MTdmZDlkMTBkODc4ZDE5Zjg5NSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKQEAgLTQ1MSwx MCArNDUxLDggQEAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6QXJy YXk8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6UGFnZTo6Q28KIHsKICAgICBSZWZQdHI8SW5zcGVj dG9yOjpUeXBlQnVpbGRlcjo6QXJyYXk8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6UGFnZTo6Q29v a2llPj4gY29va2llcyA9IEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvcjo6 VHlwZUJ1aWxkZXI6OlBhZ2U6OkNvb2tpZT46OmNyZWF0ZSgpOwogCi0gICAgTGlzdEhhc2hTZXQ8 Q29va2llPjo6aXRlcmF0b3IgZW5kID0gY29va2llc0xpc3QuZW5kKCk7Ci0gICAgTGlzdEhhc2hT ZXQ8Q29va2llPjo6aXRlcmF0b3IgaXQgPSBjb29raWVzTGlzdC5iZWdpbigpOwotICAgIGZvciAo aW50IGkgPSAwOyBpdCAhPSBlbmQ7ICsraXQsIGkrKykKLSAgICAgICAgY29va2llcy0+YWRkSXRl bShidWlsZE9iamVjdEZvckNvb2tpZSgqaXQpKTsKKyAgICBmb3IgKGF1dG8gY29va2llIDogY29v a2llc0xpc3QpCisgICAgICAgIGNvb2tpZXMtPmFkZEl0ZW0oYnVpbGRPYmplY3RGb3JDb29raWUo Y29va2llKSk7CiAKICAgICByZXR1cm4gY29va2llczsKIH0KQEAgLTQ2MywxMCArNDYxLDEwIEBA IHN0YXRpYyBWZWN0b3I8Q2FjaGVkUmVzb3VyY2UqPiBjYWNoZWRSZXNvdXJjZXNGb3JGcmFtZShG cmFtZSogZnJhbWUpCiB7CiAgICAgVmVjdG9yPENhY2hlZFJlc291cmNlKj4gcmVzdWx0OwogCi0g ICAgY29uc3QgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OkRvY3VtZW50UmVzb3VyY2VNYXAmIGFsbFJl c291cmNlcyA9IGZyYW1lLT5kb2N1bWVudCgpLT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpLT5hbGxD YWNoZWRSZXNvdXJjZXMoKTsKLSAgICBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6RG9jdW1lbnRSZXNv dXJjZU1hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gYWxsUmVzb3VyY2VzLmVuZCgpOwotICAgIGZv ciAoQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OkRvY3VtZW50UmVzb3VyY2VNYXA6OmNvbnN0X2l0ZXJh dG9yIGl0ID0gYWxsUmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAg ICBDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UgPSBpdC0+dmFsdWUuZ2V0KCk7CisgICAg Zm9yIChhdXRvIGNhY2hlZFJlc291cmNlSGFuZGxlIDogZnJhbWUtPmRvY3VtZW50KCktPmNhY2hl ZFJlc291cmNlTG9hZGVyKCktPmFsbENhY2hlZFJlc291cmNlcygpLnZhbHVlcygpKSB7CisgICAg ICAgIGF1dG8gY2FjaGVkUmVzb3VyY2UgPSBjYWNoZWRSZXNvdXJjZUhhbmRsZS5nZXQoKTsKKyAg ICAgICAgaWYgKGNhY2hlZFJlc291cmNlLT5yZXNvdXJjZVJlcXVlc3QoKS5oaWRkZW5Gcm9tSW5z cGVjdG9yKCkpCisgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBzd2l0Y2ggKGNhY2hl ZFJlc291cmNlLT50eXBlKCkpIHsKICAgICAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6SW1hZ2VS ZXNvdXJjZToKQEAgLTQ5Myw5ICs0OTEsOCBAQCBzdGF0aWMgVmVjdG9yPFVSTD4gYWxsUmVzb3Vy Y2VzVVJMc0ZvckZyYW1lKEZyYW1lKiBmcmFtZSkKIAogICAgIHJlc3VsdC5hcHBlbmQoZnJhbWUt PmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCktPnVybCgpKTsKIAotICAgIFZlY3RvcjxDYWNoZWRS ZXNvdXJjZSo+IGFsbFJlc291cmNlcyA9IGNhY2hlZFJlc291cmNlc0ZvckZyYW1lKGZyYW1lKTsK LSAgICBmb3IgKFZlY3RvcjxDYWNoZWRSZXNvdXJjZSo+Ojpjb25zdF9pdGVyYXRvciBpdCA9IGFs bFJlc291cmNlcy5iZWdpbigpOyBpdCAhPSBhbGxSZXNvdXJjZXMuZW5kKCk7ICsraXQpCi0gICAg ICAgIHJlc3VsdC5hcHBlbmQoKCppdCktPnVybCgpKTsKKyAgICBmb3IgKGF1dG8gY2FjaGVkUmVz b3VyY2UgOiBjYWNoZWRSZXNvdXJjZXNGb3JGcmFtZShmcmFtZSkpCisgICAgICAgIHJlc3VsdC5h cHBlbmQoY2FjaGVkUmVzb3VyY2UtPnVybCgpKTsKIAogICAgIHJldHVybiByZXN1bHQ7CiB9CkBA IC01MTUsMTMgKzUxMiwxMyBAQCB2b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6Z2V0Q29va2llcyhF cnJvclN0cmluZyosIFJlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOgogCiAgICAgZm9yIChG cmFtZSogZnJhbWUgPSBtYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS50 cmF2ZXJzZU5leHQobWFpbkZyYW1lKCkpKSB7CiAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9 IGZyYW1lLT5kb2N1bWVudCgpOwotICAgICAgICBWZWN0b3I8VVJMPiBhbGxVUkxzID0gYWxsUmVz b3VyY2VzVVJMc0ZvckZyYW1lKGZyYW1lKTsKLSAgICAgICAgZm9yIChWZWN0b3I8VVJMPjo6Y29u c3RfaXRlcmF0b3IgaXQgPSBhbGxVUkxzLmJlZ2luKCk7IGl0ICE9IGFsbFVSTHMuZW5kKCk7ICsr aXQpIHsKKworICAgICAgICBmb3IgKGF1dG8gdXJsIDogYWxsUmVzb3VyY2VzVVJMc0ZvckZyYW1l KGZyYW1lKSkgewogICAgICAgICAgICAgVmVjdG9yPENvb2tpZT4gZG9jQ29va2llc0xpc3Q7Ci0g ICAgICAgICAgICByYXdDb29raWVzSW1wbGVtZW50ZWQgPSBnZXRSYXdDb29raWVzKGRvY3VtZW50 LCBVUkwoUGFyc2VkVVJMU3RyaW5nLCAqaXQpLCBkb2NDb29raWVzTGlzdCk7CisgICAgICAgICAg ICByYXdDb29raWVzSW1wbGVtZW50ZWQgPSBnZXRSYXdDb29raWVzKGRvY3VtZW50LCBVUkwoUGFy c2VkVVJMU3RyaW5nLCB1cmwpLCBkb2NDb29raWVzTGlzdCk7CisKICAgICAgICAgICAgIGlmICgh cmF3Q29va2llc0ltcGxlbWVudGVkKSB7CiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFdlIG5l ZWQgZHVwbGljYXRpb24gY2hlY2tpbmcgZm9yIHRoZSBTdHJpbmcgcmVwcmVzZW50YXRpb24gb2Yg Y29va2llcy4KLSAgICAgICAgICAgICAgICAvLwogICAgICAgICAgICAgICAgIC8vIEV4Y2VwdGlv bnMgYXJlIHRocm93biBieSBjb29raWUoKSBpbiBzYW5kYm94ZWQgZnJhbWVzLiBUaGF0IHdvbid0 IGhhcHBlbiBoZXJlCiAgICAgICAgICAgICAgICAgLy8gYmVjYXVzZSAiZG9jdW1lbnQiIGlzIHRo ZSBkb2N1bWVudCBvZiB0aGUgbWFpbiBmcmFtZSBvZiB0aGUgcGFnZS4KICAgICAgICAgICAgICAg ICBzdHJpbmdDb29raWVzTGlzdC5hcHBlbmQoZG9jdW1lbnQtPmNvb2tpZShBU1NFUlRfTk9fRVhD RVBUSU9OKSk7CkBAIC02MjksMTUgKzYyNiwxNSBAQCB2b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6 c2VhcmNoSW5SZXNvdXJjZXMoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHRleHQsIGNvbgog CiAgICAgZm9yIChGcmFtZSogZnJhbWUgPSAmbV9wYWdlLT5tYWluRnJhbWUoKTsgZnJhbWU7IGZy YW1lID0gZnJhbWUtPnRyZWUoKS50cmF2ZXJzZU5leHQoJm1fcGFnZS0+bWFpbkZyYW1lKCkpKSB7 CiAgICAgICAgIFN0cmluZyBjb250ZW50OwotICAgICAgICBWZWN0b3I8Q2FjaGVkUmVzb3VyY2Uq PiBhbGxSZXNvdXJjZXMgPSBjYWNoZWRSZXNvdXJjZXNGb3JGcmFtZShmcmFtZSk7Ci0gICAgICAg IGZvciAoVmVjdG9yPENhY2hlZFJlc291cmNlKj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gYWxsUmVz b3VyY2VzLmJlZ2luKCk7IGl0ICE9IGFsbFJlc291cmNlcy5lbmQoKTsgKytpdCkgewotICAgICAg ICAgICAgQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlID0gKml0OworCisgICAgICAgIGZv ciAoYXV0byBjYWNoZWRSZXNvdXJjZSA6IGNhY2hlZFJlc291cmNlc0ZvckZyYW1lKGZyYW1lKSkg ewogICAgICAgICAgICAgaWYgKHRleHRDb250ZW50Rm9yQ2FjaGVkUmVzb3VyY2UoY2FjaGVkUmVz b3VyY2UsICZjb250ZW50KSkgewogICAgICAgICAgICAgICAgIGludCBtYXRjaGVzQ291bnQgPSBD b250ZW50U2VhcmNoVXRpbGl0aWVzOjpjb3VudFJlZ3VsYXJFeHByZXNzaW9uTWF0Y2hlcyhyZWdl eCwgY29udGVudCk7CiAgICAgICAgICAgICAgICAgaWYgKG1hdGNoZXNDb3VudCkKICAgICAgICAg ICAgICAgICAgICAgc2VhcmNoUmVzdWx0cy0+YWRkSXRlbShidWlsZE9iamVjdEZvclNlYXJjaFJl c3VsdChmcmFtZUlkKGZyYW1lKSwgY2FjaGVkUmVzb3VyY2UtPnVybCgpLCBtYXRjaGVzQ291bnQp KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQorCiAgICAgICAgIGlmIChtYWluUmVzb3VyY2VD b250ZW50KGZyYW1lLCBmYWxzZSwgJmNvbnRlbnQpKSB7CiAgICAgICAgICAgICBpbnQgbWF0Y2hl c0NvdW50ID0gQ29udGVudFNlYXJjaFV0aWxpdGllczo6Y291bnRSZWd1bGFyRXhwcmVzc2lvbk1h dGNoZXMocmVnZXgsIGNvbnRlbnQpOwogICAgICAgICAgICAgaWYgKG1hdGNoZXNDb3VudCkKQEAg LTc0OSwxMCArNzQ2LDkgQEAgdm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmRpZENsZWFyV2luZG93 T2JqZWN0SW5Xb3JsZChGcmFtZSogZnJhbWUsIERPTVdyYXBwZXJXb3IKICAgICAgICAgcmV0dXJu OwogCiAgICAgaWYgKG1fc2NyaXB0c1RvRXZhbHVhdGVPbkxvYWQpIHsKLSAgICAgICAgSW5zcGVj dG9yT2JqZWN0Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX3NjcmlwdHNUb0V2YWx1YXRlT25Mb2Fk LT5lbmQoKTsKLSAgICAgICAgZm9yIChJbnNwZWN0b3JPYmplY3Q6OmNvbnN0X2l0ZXJhdG9yIGl0 ID0gbV9zY3JpcHRzVG9FdmFsdWF0ZU9uTG9hZC0+YmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7 CisgICAgICAgIGZvciAoYXV0byBrZXlWYWx1ZVBhaXIgOiAqbV9zY3JpcHRzVG9FdmFsdWF0ZU9u TG9hZCkgewogICAgICAgICAgICAgU3RyaW5nIHNjcmlwdFRleHQ7Ci0gICAgICAgICAgICBpZiAo aXQtPnZhbHVlLT5hc1N0cmluZygmc2NyaXB0VGV4dCkpCisgICAgICAgICAgICBpZiAoa2V5VmFs dWVQYWlyLnZhbHVlLT5hc1N0cmluZygmc2NyaXB0VGV4dCkpCiAgICAgICAgICAgICAgICAgZnJh bWUtPnNjcmlwdCgpLmV4ZWN1dGVTY3JpcHQoc2NyaXB0VGV4dCk7CiAgICAgICAgIH0KICAgICB9 CkBAIC04NjIsOSArODU4LDcgQEAgRG9jdW1lbnRMb2FkZXIqIEluc3BlY3RvclBhZ2VBZ2VudDo6 YXNzZXJ0RG9jdW1lbnRMb2FkZXIoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW4KIAogdm9pZCBJbnNw ZWN0b3JQYWdlQWdlbnQ6OmxvYWRlckRldGFjaGVkRnJvbUZyYW1lKERvY3VtZW50TG9hZGVyKiBs b2FkZXIpCiB7Ci0gICAgSGFzaE1hcDxEb2N1bWVudExvYWRlciosIFN0cmluZz46Oml0ZXJhdG9y IGl0ZXJhdG9yID0gbV9sb2FkZXJUb0lkZW50aWZpZXIuZmluZChsb2FkZXIpOwotICAgIGlmIChp dGVyYXRvciAhPSBtX2xvYWRlclRvSWRlbnRpZmllci5lbmQoKSkKLSAgICAgICAgbV9sb2FkZXJU b0lkZW50aWZpZXIucmVtb3ZlKGl0ZXJhdG9yKTsKKyAgICBtX2xvYWRlclRvSWRlbnRpZmllci5y ZW1vdmUobG9hZGVyKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmZyYW1lU3RhcnRl ZExvYWRpbmcoRnJhbWUmIGZyYW1lKQpAQCAtOTc0LDEzICs5NjgsNyBAQCBQYXNzUmVmUHRyPElu c3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlBhZ2U6OkZyYW1lUmVzb3VyY2VUcmVlPiBJbnNwZWN0b3JQ YWdlQWdlbnQ6OgogICAgICAgICAgLnNldEZyYW1lKGZyYW1lT2JqZWN0KQogICAgICAgICAgLnNl dFJlc291cmNlcyhzdWJyZXNvdXJjZXMpOwogCi0gICAgVmVjdG9yPENhY2hlZFJlc291cmNlKj4g YWxsUmVzb3VyY2VzID0gY2FjaGVkUmVzb3VyY2VzRm9yRnJhbWUoZnJhbWUpOwotICAgIGZvciAo VmVjdG9yPENhY2hlZFJlc291cmNlKj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gYWxsUmVzb3VyY2Vz LmJlZ2luKCk7IGl0ICE9IGFsbFJlc291cmNlcy5lbmQoKTsgKytpdCkgewotICAgICAgICBDYWNo ZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UgPSAqaXQ7Ci0KLSAgICAgICAgaWYgKGNhY2hlZFJl c291cmNlLT5yZXNvdXJjZVJlcXVlc3QoKS5oaWRkZW5Gcm9tSW5zcGVjdG9yKCkpCi0gICAgICAg ICAgICBjb250aW51ZTsKLQorICAgIGZvciAoYXV0byBjYWNoZWRSZXNvdXJjZSA6IGNhY2hlZFJl c291cmNlc0ZvckZyYW1lKGZyYW1lKSkgewogICAgICAgICBSZWZQdHI8SW5zcGVjdG9yOjpUeXBl QnVpbGRlcjo6UGFnZTo6RnJhbWVSZXNvdXJjZVRyZWU6OlJlc291cmNlcz4gcmVzb3VyY2VPYmpl Y3QgPSBJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpQYWdlOjpGcmFtZVJlc291cmNlVHJlZTo6UmVz b3VyY2VzOjpjcmVhdGUoKQogICAgICAgICAgICAgLnNldFVybChjYWNoZWRSZXNvdXJjZS0+dXJs KCkpCiAgICAgICAgICAgICAuc2V0VHlwZShjYWNoZWRSZXNvdXJjZVR5cGVKc29uKCpjYWNoZWRS ZXNvdXJjZSkpCg== 227894 2014-03-26 15:47:30 -0700 2014-03-26 16:20:36 -0700 Patch bug-130803-20140326154709.patch text/plain 7770 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFkZTc5ZGRhYzlmY2U5 Y2EyNDU0NmI1NTE0MTAzYTM5MWM0NTc0ZC4uZjIzMjc4ZjQ1MmY3ZjQxZWIyMjE1Y2ZlOGI0NTg2 Zjc0NTA0MzNmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAzLTI2ICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBNb2Rlcm5pemUgdGhl IGxvb3BzIGluIEluc3BlY3RvclBhZ2VBZ2VudC5jcHAuCisKKyAgICAgICAgQWxzbyBtb3ZlcyB0 aGUgY2hlY2sgZm9yIGhpZGRlbkZyb21JbnNwZWN0b3IgdG8gYSBsb3dlciBsZXZlbC4KKyAgICAg ICAgVGhpcyBoaWRlcyBoaWRkZW4gcmVzb3VyY2VzIGZyb20gbW9yZSBwbGFjZXMuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDgwMworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvclBhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpidWlsZEFycmF5Rm9yQ29v a2llcyk6CisgICAgICAgIChXZWJDb3JlOjpjYWNoZWRSZXNvdXJjZXNGb3JGcmFtZSk6CisgICAg ICAgIChXZWJDb3JlOjphbGxSZXNvdXJjZXNVUkxzRm9yRnJhbWUpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpnZXRDb29raWVzKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclBhZ2VBZ2VudDo6c2VhcmNoSW5SZXNvdXJjZXMpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yUGFnZUFnZW50OjpkaWRDbGVhcldpbmRvd09iamVjdEluV29ybGQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50Ojpsb2FkZXJEZXRhY2hlZEZyb21GcmFtZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9yRnJh bWVUcmVlKToKKwogMjAxNC0wMy0yNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKICAgICAgICAgUHJvcGFnYXRlIHRoZSBoaWRkZW5Gcm9tSW5zcGVjdG9yIGZsYWcgb24g UmVzb3VyY2VSZXF1ZXN0IGluCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUGFnZUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JQYWdlQWdlbnQuY3BwCmluZGV4IDY3NmRhNTk0M2E3M2Q4ZDFlM2UyZGNjMzI4M2YzOTk4NmUx OWZjMTEuLjdhMDMzYTgxZGNjOTk3MjRmYmM5ZjM2MTkxYmJkYmYwOGUwOGRjYjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwCkBAIC00NTEs MTAgKzQ1MSw4IEBAIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OkFy cmF5PEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlBhZ2U6OkNvCiB7CiAgICAgUmVmUHRyPEluc3Bl Y3Rvcjo6VHlwZUJ1aWxkZXI6OkFycmF5PEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlBhZ2U6OkNv b2tpZT4+IGNvb2tpZXMgPSBJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0b3I6 OlR5cGVCdWlsZGVyOjpQYWdlOjpDb29raWU+OjpjcmVhdGUoKTsKIAotICAgIExpc3RIYXNoU2V0 PENvb2tpZT46Oml0ZXJhdG9yIGVuZCA9IGNvb2tpZXNMaXN0LmVuZCgpOwotICAgIExpc3RIYXNo U2V0PENvb2tpZT46Oml0ZXJhdG9yIGl0ID0gY29va2llc0xpc3QuYmVnaW4oKTsKLSAgICBmb3Ig KGludCBpID0gMDsgaXQgIT0gZW5kOyArK2l0LCBpKyspCi0gICAgICAgIGNvb2tpZXMtPmFkZEl0 ZW0oYnVpbGRPYmplY3RGb3JDb29raWUoKml0KSk7CisgICAgZm9yIChhdXRvJiBjb29raWUgOiBj b29raWVzTGlzdCkKKyAgICAgICAgY29va2llcy0+YWRkSXRlbShidWlsZE9iamVjdEZvckNvb2tp ZShjb29raWUpKTsKIAogICAgIHJldHVybiBjb29raWVzOwogfQpAQCAtNDYzLDEwICs0NjEsMTAg QEAgc3RhdGljIFZlY3RvcjxDYWNoZWRSZXNvdXJjZSo+IGNhY2hlZFJlc291cmNlc0ZvckZyYW1l KEZyYW1lKiBmcmFtZSkKIHsKICAgICBWZWN0b3I8Q2FjaGVkUmVzb3VyY2UqPiByZXN1bHQ7CiAK LSAgICBjb25zdCBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6RG9jdW1lbnRSZXNvdXJjZU1hcCYgYWxs UmVzb3VyY2VzID0gZnJhbWUtPmRvY3VtZW50KCktPmNhY2hlZFJlc291cmNlTG9hZGVyKCktPmFs bENhY2hlZFJlc291cmNlcygpOwotICAgIENhY2hlZFJlc291cmNlTG9hZGVyOjpEb2N1bWVudFJl c291cmNlTWFwOjpjb25zdF9pdGVyYXRvciBlbmQgPSBhbGxSZXNvdXJjZXMuZW5kKCk7Ci0gICAg Zm9yIChDYWNoZWRSZXNvdXJjZUxvYWRlcjo6RG9jdW1lbnRSZXNvdXJjZU1hcDo6Y29uc3RfaXRl cmF0b3IgaXQgPSBhbGxSZXNvdXJjZXMuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KSB7Ci0gICAg ICAgIENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJjZSA9IGl0LT52YWx1ZS5nZXQoKTsKKyAg ICBmb3IgKGF1dG8mIGNhY2hlZFJlc291cmNlSGFuZGxlIDogZnJhbWUtPmRvY3VtZW50KCktPmNh Y2hlZFJlc291cmNlTG9hZGVyKCktPmFsbENhY2hlZFJlc291cmNlcygpLnZhbHVlcygpKSB7Cisg ICAgICAgIGF1dG8gY2FjaGVkUmVzb3VyY2UgPSBjYWNoZWRSZXNvdXJjZUhhbmRsZS5nZXQoKTsK KyAgICAgICAgaWYgKGNhY2hlZFJlc291cmNlLT5yZXNvdXJjZVJlcXVlc3QoKS5oaWRkZW5Gcm9t SW5zcGVjdG9yKCkpCisgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBzd2l0Y2ggKGNh Y2hlZFJlc291cmNlLT50eXBlKCkpIHsKICAgICAgICAgY2FzZSBDYWNoZWRSZXNvdXJjZTo6SW1h Z2VSZXNvdXJjZToKQEAgLTQ5Myw5ICs0OTEsOCBAQCBzdGF0aWMgVmVjdG9yPFVSTD4gYWxsUmVz b3VyY2VzVVJMc0ZvckZyYW1lKEZyYW1lKiBmcmFtZSkKIAogICAgIHJlc3VsdC5hcHBlbmQoZnJh bWUtPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCktPnVybCgpKTsKIAotICAgIFZlY3RvcjxDYWNo ZWRSZXNvdXJjZSo+IGFsbFJlc291cmNlcyA9IGNhY2hlZFJlc291cmNlc0ZvckZyYW1lKGZyYW1l KTsKLSAgICBmb3IgKFZlY3RvcjxDYWNoZWRSZXNvdXJjZSo+Ojpjb25zdF9pdGVyYXRvciBpdCA9 IGFsbFJlc291cmNlcy5iZWdpbigpOyBpdCAhPSBhbGxSZXNvdXJjZXMuZW5kKCk7ICsraXQpCi0g ICAgICAgIHJlc3VsdC5hcHBlbmQoKCppdCktPnVybCgpKTsKKyAgICBmb3IgKGF1dG8qIGNhY2hl ZFJlc291cmNlIDogY2FjaGVkUmVzb3VyY2VzRm9yRnJhbWUoZnJhbWUpKQorICAgICAgICByZXN1 bHQuYXBwZW5kKGNhY2hlZFJlc291cmNlLT51cmwoKSk7CiAKICAgICByZXR1cm4gcmVzdWx0Owog fQpAQCAtNTE1LDEzICs1MTIsMTMgQEAgdm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmdldENvb2tp ZXMoRXJyb3JTdHJpbmcqLCBSZWZQdHI8SW5zcGVjdG9yOjpUeXBlQnVpbGRlcjoKIAogICAgIGZv ciAoRnJhbWUqIGZyYW1lID0gbWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVl KCkudHJhdmVyc2VOZXh0KG1haW5GcmFtZSgpKSkgewogICAgICAgICBEb2N1bWVudCogZG9jdW1l bnQgPSBmcmFtZS0+ZG9jdW1lbnQoKTsKLSAgICAgICAgVmVjdG9yPFVSTD4gYWxsVVJMcyA9IGFs bFJlc291cmNlc1VSTHNGb3JGcmFtZShmcmFtZSk7Ci0gICAgICAgIGZvciAoVmVjdG9yPFVSTD46 OmNvbnN0X2l0ZXJhdG9yIGl0ID0gYWxsVVJMcy5iZWdpbigpOyBpdCAhPSBhbGxVUkxzLmVuZCgp OyArK2l0KSB7CisKKyAgICAgICAgZm9yIChhdXRvJiB1cmwgOiBhbGxSZXNvdXJjZXNVUkxzRm9y RnJhbWUoZnJhbWUpKSB7CiAgICAgICAgICAgICBWZWN0b3I8Q29va2llPiBkb2NDb29raWVzTGlz dDsKLSAgICAgICAgICAgIHJhd0Nvb2tpZXNJbXBsZW1lbnRlZCA9IGdldFJhd0Nvb2tpZXMoZG9j dW1lbnQsIFVSTChQYXJzZWRVUkxTdHJpbmcsICppdCksIGRvY0Nvb2tpZXNMaXN0KTsKKyAgICAg ICAgICAgIHJhd0Nvb2tpZXNJbXBsZW1lbnRlZCA9IGdldFJhd0Nvb2tpZXMoZG9jdW1lbnQsIFVS TChQYXJzZWRVUkxTdHJpbmcsIHVybCksIGRvY0Nvb2tpZXNMaXN0KTsKKwogICAgICAgICAgICAg aWYgKCFyYXdDb29raWVzSW1wbGVtZW50ZWQpIHsKICAgICAgICAgICAgICAgICAvLyBGSVhNRTog V2UgbmVlZCBkdXBsaWNhdGlvbiBjaGVja2luZyBmb3IgdGhlIFN0cmluZyByZXByZXNlbnRhdGlv biBvZiBjb29raWVzLgotICAgICAgICAgICAgICAgIC8vCiAgICAgICAgICAgICAgICAgLy8gRXhj ZXB0aW9ucyBhcmUgdGhyb3duIGJ5IGNvb2tpZSgpIGluIHNhbmRib3hlZCBmcmFtZXMuIFRoYXQg d29uJ3QgaGFwcGVuIGhlcmUKICAgICAgICAgICAgICAgICAvLyBiZWNhdXNlICJkb2N1bWVudCIg aXMgdGhlIGRvY3VtZW50IG9mIHRoZSBtYWluIGZyYW1lIG9mIHRoZSBwYWdlLgogICAgICAgICAg ICAgICAgIHN0cmluZ0Nvb2tpZXNMaXN0LmFwcGVuZChkb2N1bWVudC0+Y29va2llKEFTU0VSVF9O T19FWENFUFRJT04pKTsKQEAgLTYyOSwxNSArNjI2LDE1IEBAIHZvaWQgSW5zcGVjdG9yUGFnZUFn ZW50OjpzZWFyY2hJblJlc291cmNlcyhFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgdGV4dCwg Y29uCiAKICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9ICZtX3BhZ2UtPm1haW5GcmFtZSgpOyBmcmFt ZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLnRyYXZlcnNlTmV4dCgmbV9wYWdlLT5tYWluRnJhbWUo KSkpIHsKICAgICAgICAgU3RyaW5nIGNvbnRlbnQ7Ci0gICAgICAgIFZlY3RvcjxDYWNoZWRSZXNv dXJjZSo+IGFsbFJlc291cmNlcyA9IGNhY2hlZFJlc291cmNlc0ZvckZyYW1lKGZyYW1lKTsKLSAg ICAgICAgZm9yIChWZWN0b3I8Q2FjaGVkUmVzb3VyY2UqPjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBh bGxSZXNvdXJjZXMuYmVnaW4oKTsgaXQgIT0gYWxsUmVzb3VyY2VzLmVuZCgpOyArK2l0KSB7Ci0g ICAgICAgICAgICBDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UgPSAqaXQ7CisKKyAgICAg ICAgZm9yIChhdXRvKiBjYWNoZWRSZXNvdXJjZSA6IGNhY2hlZFJlc291cmNlc0ZvckZyYW1lKGZy YW1lKSkgewogICAgICAgICAgICAgaWYgKHRleHRDb250ZW50Rm9yQ2FjaGVkUmVzb3VyY2UoY2Fj aGVkUmVzb3VyY2UsICZjb250ZW50KSkgewogICAgICAgICAgICAgICAgIGludCBtYXRjaGVzQ291 bnQgPSBDb250ZW50U2VhcmNoVXRpbGl0aWVzOjpjb3VudFJlZ3VsYXJFeHByZXNzaW9uTWF0Y2hl cyhyZWdleCwgY29udGVudCk7CiAgICAgICAgICAgICAgICAgaWYgKG1hdGNoZXNDb3VudCkKICAg ICAgICAgICAgICAgICAgICAgc2VhcmNoUmVzdWx0cy0+YWRkSXRlbShidWlsZE9iamVjdEZvclNl YXJjaFJlc3VsdChmcmFtZUlkKGZyYW1lKSwgY2FjaGVkUmVzb3VyY2UtPnVybCgpLCBtYXRjaGVz Q291bnQpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQorCiAgICAgICAgIGlmIChtYWluUmVz b3VyY2VDb250ZW50KGZyYW1lLCBmYWxzZSwgJmNvbnRlbnQpKSB7CiAgICAgICAgICAgICBpbnQg bWF0Y2hlc0NvdW50ID0gQ29udGVudFNlYXJjaFV0aWxpdGllczo6Y291bnRSZWd1bGFyRXhwcmVz c2lvbk1hdGNoZXMocmVnZXgsIGNvbnRlbnQpOwogICAgICAgICAgICAgaWYgKG1hdGNoZXNDb3Vu dCkKQEAgLTc0OSwxMCArNzQ2LDkgQEAgdm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmRpZENsZWFy V2luZG93T2JqZWN0SW5Xb3JsZChGcmFtZSogZnJhbWUsIERPTVdyYXBwZXJXb3IKICAgICAgICAg cmV0dXJuOwogCiAgICAgaWYgKG1fc2NyaXB0c1RvRXZhbHVhdGVPbkxvYWQpIHsKLSAgICAgICAg SW5zcGVjdG9yT2JqZWN0Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX3NjcmlwdHNUb0V2YWx1YXRl T25Mb2FkLT5lbmQoKTsKLSAgICAgICAgZm9yIChJbnNwZWN0b3JPYmplY3Q6OmNvbnN0X2l0ZXJh dG9yIGl0ID0gbV9zY3JpcHRzVG9FdmFsdWF0ZU9uTG9hZC0+YmVnaW4oKTsgaXQgIT0gZW5kOyAr K2l0KSB7CisgICAgICAgIGZvciAoYXV0byYga2V5VmFsdWVQYWlyIDogKm1fc2NyaXB0c1RvRXZh bHVhdGVPbkxvYWQpIHsKICAgICAgICAgICAgIFN0cmluZyBzY3JpcHRUZXh0OwotICAgICAgICAg ICAgaWYgKGl0LT52YWx1ZS0+YXNTdHJpbmcoJnNjcmlwdFRleHQpKQorICAgICAgICAgICAgaWYg KGtleVZhbHVlUGFpci52YWx1ZS0+YXNTdHJpbmcoJnNjcmlwdFRleHQpKQogICAgICAgICAgICAg ICAgIGZyYW1lLT5zY3JpcHQoKS5leGVjdXRlU2NyaXB0KHNjcmlwdFRleHQpOwogICAgICAgICB9 CiAgICAgfQpAQCAtODYyLDkgKzg1OCw3IEBAIERvY3VtZW50TG9hZGVyKiBJbnNwZWN0b3JQYWdl QWdlbnQ6OmFzc2VydERvY3VtZW50TG9hZGVyKEVycm9yU3RyaW5nKiBlcnJvclN0cmluCiAKIHZv aWQgSW5zcGVjdG9yUGFnZUFnZW50Ojpsb2FkZXJEZXRhY2hlZEZyb21GcmFtZShEb2N1bWVudExv YWRlciogbG9hZGVyKQogewotICAgIEhhc2hNYXA8RG9jdW1lbnRMb2FkZXIqLCBTdHJpbmc+Ojpp dGVyYXRvciBpdGVyYXRvciA9IG1fbG9hZGVyVG9JZGVudGlmaWVyLmZpbmQobG9hZGVyKTsKLSAg ICBpZiAoaXRlcmF0b3IgIT0gbV9sb2FkZXJUb0lkZW50aWZpZXIuZW5kKCkpCi0gICAgICAgIG1f bG9hZGVyVG9JZGVudGlmaWVyLnJlbW92ZShpdGVyYXRvcik7CisgICAgbV9sb2FkZXJUb0lkZW50 aWZpZXIucmVtb3ZlKGxvYWRlcik7CiB9CiAKIHZvaWQgSW5zcGVjdG9yUGFnZUFnZW50OjpmcmFt ZVN0YXJ0ZWRMb2FkaW5nKEZyYW1lJiBmcmFtZSkKQEAgLTk3NCwxMyArOTY4LDcgQEAgUGFzc1Jl ZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpQYWdlOjpGcmFtZVJlc291cmNlVHJlZT4gSW5z cGVjdG9yUGFnZUFnZW50OjoKICAgICAgICAgIC5zZXRGcmFtZShmcmFtZU9iamVjdCkKICAgICAg ICAgIC5zZXRSZXNvdXJjZXMoc3VicmVzb3VyY2VzKTsKIAotICAgIFZlY3RvcjxDYWNoZWRSZXNv dXJjZSo+IGFsbFJlc291cmNlcyA9IGNhY2hlZFJlc291cmNlc0ZvckZyYW1lKGZyYW1lKTsKLSAg ICBmb3IgKFZlY3RvcjxDYWNoZWRSZXNvdXJjZSo+Ojpjb25zdF9pdGVyYXRvciBpdCA9IGFsbFJl c291cmNlcy5iZWdpbigpOyBpdCAhPSBhbGxSZXNvdXJjZXMuZW5kKCk7ICsraXQpIHsKLSAgICAg ICAgQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlID0gKml0OwotCi0gICAgICAgIGlmIChj YWNoZWRSZXNvdXJjZS0+cmVzb3VyY2VSZXF1ZXN0KCkuaGlkZGVuRnJvbUluc3BlY3RvcigpKQot ICAgICAgICAgICAgY29udGludWU7Ci0KKyAgICBmb3IgKGF1dG8qIGNhY2hlZFJlc291cmNlIDog Y2FjaGVkUmVzb3VyY2VzRm9yRnJhbWUoZnJhbWUpKSB7CiAgICAgICAgIFJlZlB0cjxJbnNwZWN0 b3I6OlR5cGVCdWlsZGVyOjpQYWdlOjpGcmFtZVJlc291cmNlVHJlZTo6UmVzb3VyY2VzPiByZXNv dXJjZU9iamVjdCA9IEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlBhZ2U6OkZyYW1lUmVzb3VyY2VU cmVlOjpSZXNvdXJjZXM6OmNyZWF0ZSgpCiAgICAgICAgICAgICAuc2V0VXJsKGNhY2hlZFJlc291 cmNlLT51cmwoKSkKICAgICAgICAgICAgIC5zZXRUeXBlKGNhY2hlZFJlc291cmNlVHlwZUpzb24o KmNhY2hlZFJlc291cmNlKSkK 227896 2014-03-26 16:20:40 -0700 2014-03-26 16:58:42 -0700 Patch bug-130803-20140326162019.patch text/plain 7772 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MTkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFkZTc5ZGRhYzlmY2U5 Y2EyNDU0NmI1NTE0MTAzYTM5MWM0NTc0ZC4uODc5NzQ0OTY2MDllOTdlYzUwYThkOGQ0NDFkNmUy NzQ1YmNkZWI3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE0LTAzLTI2ICBUaW1v dGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKworICAgICAgICBNb2Rlcm5pemUgdGhl IGxvb3BzIGluIEluc3BlY3RvclBhZ2VBZ2VudC5jcHAuCisKKyAgICAgICAgQWxzbyBtb3ZlcyB0 aGUgY2hlY2sgZm9yIGhpZGRlbkZyb21JbnNwZWN0b3IgdG8gYSBsb3dlciBsZXZlbC4KKyAgICAg ICAgVGhpcyBoaWRlcyBoaWRkZW4gcmVzb3VyY2VzIGZyb20gbW9yZSBwbGFjZXMuCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDgwMworCisgICAg ICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAgICAqIGluc3BlY3Rvci9J bnNwZWN0b3JQYWdlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YnVpbGRBcnJheUZvckNv b2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6Y2FjaGVkUmVzb3VyY2VzRm9yRnJhbWUpOgorICAg ICAgICAoV2ViQ29yZTo6YWxsUmVzb3VyY2VzVVJMc0ZvckZyYW1lKToKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6Z2V0Q29va2llcyk6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JQYWdlQWdlbnQ6OnNlYXJjaEluUmVzb3VyY2VzKToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvclBhZ2VBZ2VudDo6ZGlkQ2xlYXJXaW5kb3dPYmplY3RJbldvcmxkKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6bG9hZGVyRGV0YWNoZWRGcm9tRnJhbWUp OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpidWlsZE9iamVjdEZvckZy YW1lVHJlZSk6CisKIDIwMTQtMDMtMjUgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUu Y29tPgogCiAgICAgICAgIFByb3BhZ2F0ZSB0aGUgaGlkZGVuRnJvbUluc3BlY3RvciBmbGFnIG9u IFJlc291cmNlUmVxdWVzdCBpbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclBhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUGFnZUFnZW50LmNwcAppbmRleCA2NzZkYTU5NDNhNzNkOGQxZTNlMmRjYzMyODNmMzk5ODZl MTlmYzExLi5lYThhM2YzMjdjMjEyODY5NmU1NjkwZWU5NzIzMDM4NGE1NTJjNDFiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUGFnZUFnZW50LmNwcApAQCAtNDUx LDEwICs0NTEsOCBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpB cnJheTxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpQYWdlOjpDbwogewogICAgIFJlZlB0cjxJbnNw ZWN0b3I6OlR5cGVCdWlsZGVyOjpBcnJheTxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOjpQYWdlOjpD b29raWU+PiBjb29raWVzID0gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6QXJyYXk8SW5zcGVjdG9y OjpUeXBlQnVpbGRlcjo6UGFnZTo6Q29va2llPjo6Y3JlYXRlKCk7CiAKLSAgICBMaXN0SGFzaFNl dDxDb29raWU+OjppdGVyYXRvciBlbmQgPSBjb29raWVzTGlzdC5lbmQoKTsKLSAgICBMaXN0SGFz aFNldDxDb29raWU+OjppdGVyYXRvciBpdCA9IGNvb2tpZXNMaXN0LmJlZ2luKCk7Ci0gICAgZm9y IChpbnQgaSA9IDA7IGl0ICE9IGVuZDsgKytpdCwgaSsrKQotICAgICAgICBjb29raWVzLT5hZGRJ dGVtKGJ1aWxkT2JqZWN0Rm9yQ29va2llKCppdCkpOworICAgIGZvciAoYXV0byYgY29va2llIDog Y29va2llc0xpc3QpCisgICAgICAgIGNvb2tpZXMtPmFkZEl0ZW0oYnVpbGRPYmplY3RGb3JDb29r aWUoY29va2llKSk7CiAKICAgICByZXR1cm4gY29va2llczsKIH0KQEAgLTQ2MywxMCArNDYxLDEw IEBAIHN0YXRpYyBWZWN0b3I8Q2FjaGVkUmVzb3VyY2UqPiBjYWNoZWRSZXNvdXJjZXNGb3JGcmFt ZShGcmFtZSogZnJhbWUpCiB7CiAgICAgVmVjdG9yPENhY2hlZFJlc291cmNlKj4gcmVzdWx0Owog Ci0gICAgY29uc3QgQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OkRvY3VtZW50UmVzb3VyY2VNYXAmIGFs bFJlc291cmNlcyA9IGZyYW1lLT5kb2N1bWVudCgpLT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpLT5h bGxDYWNoZWRSZXNvdXJjZXMoKTsKLSAgICBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6RG9jdW1lbnRS ZXNvdXJjZU1hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gYWxsUmVzb3VyY2VzLmVuZCgpOwotICAg IGZvciAoQ2FjaGVkUmVzb3VyY2VMb2FkZXI6OkRvY3VtZW50UmVzb3VyY2VNYXA6OmNvbnN0X2l0 ZXJhdG9yIGl0ID0gYWxsUmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAg ICAgICBDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UgPSBpdC0+dmFsdWUuZ2V0KCk7Cisg ICAgZm9yIChhdXRvJiBjYWNoZWRSZXNvdXJjZUhhbmRsZSA6IGZyYW1lLT5kb2N1bWVudCgpLT5j YWNoZWRSZXNvdXJjZUxvYWRlcigpLT5hbGxDYWNoZWRSZXNvdXJjZXMoKS52YWx1ZXMoKSkgewor ICAgICAgICBhdXRvKiBjYWNoZWRSZXNvdXJjZSA9IGNhY2hlZFJlc291cmNlSGFuZGxlLmdldCgp OworICAgICAgICBpZiAoY2FjaGVkUmVzb3VyY2UtPnJlc291cmNlUmVxdWVzdCgpLmhpZGRlbkZy b21JbnNwZWN0b3IoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIHN3aXRjaCAo Y2FjaGVkUmVzb3VyY2UtPnR5cGUoKSkgewogICAgICAgICBjYXNlIENhY2hlZFJlc291cmNlOjpJ bWFnZVJlc291cmNlOgpAQCAtNDkzLDkgKzQ5MSw4IEBAIHN0YXRpYyBWZWN0b3I8VVJMPiBhbGxS ZXNvdXJjZXNVUkxzRm9yRnJhbWUoRnJhbWUqIGZyYW1lKQogCiAgICAgcmVzdWx0LmFwcGVuZChm cmFtZS0+bG9hZGVyKCkuZG9jdW1lbnRMb2FkZXIoKS0+dXJsKCkpOwogCi0gICAgVmVjdG9yPENh Y2hlZFJlc291cmNlKj4gYWxsUmVzb3VyY2VzID0gY2FjaGVkUmVzb3VyY2VzRm9yRnJhbWUoZnJh bWUpOwotICAgIGZvciAoVmVjdG9yPENhY2hlZFJlc291cmNlKj46OmNvbnN0X2l0ZXJhdG9yIGl0 ID0gYWxsUmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9IGFsbFJlc291cmNlcy5lbmQoKTsgKytpdCkK LSAgICAgICAgcmVzdWx0LmFwcGVuZCgoKml0KS0+dXJsKCkpOworICAgIGZvciAoYXV0byogY2Fj aGVkUmVzb3VyY2UgOiBjYWNoZWRSZXNvdXJjZXNGb3JGcmFtZShmcmFtZSkpCisgICAgICAgIHJl c3VsdC5hcHBlbmQoY2FjaGVkUmVzb3VyY2UtPnVybCgpKTsKIAogICAgIHJldHVybiByZXN1bHQ7 CiB9CkBAIC01MTUsMTMgKzUxMiwxMyBAQCB2b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6Z2V0Q29v a2llcyhFcnJvclN0cmluZyosIFJlZlB0cjxJbnNwZWN0b3I6OlR5cGVCdWlsZGVyOgogCiAgICAg Zm9yIChGcmFtZSogZnJhbWUgPSBtYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRy ZWUoKS50cmF2ZXJzZU5leHQobWFpbkZyYW1lKCkpKSB7CiAgICAgICAgIERvY3VtZW50KiBkb2N1 bWVudCA9IGZyYW1lLT5kb2N1bWVudCgpOwotICAgICAgICBWZWN0b3I8VVJMPiBhbGxVUkxzID0g YWxsUmVzb3VyY2VzVVJMc0ZvckZyYW1lKGZyYW1lKTsKLSAgICAgICAgZm9yIChWZWN0b3I8VVJM Pjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBhbGxVUkxzLmJlZ2luKCk7IGl0ICE9IGFsbFVSTHMuZW5k KCk7ICsraXQpIHsKKworICAgICAgICBmb3IgKGF1dG8mIHVybCA6IGFsbFJlc291cmNlc1VSTHNG b3JGcmFtZShmcmFtZSkpIHsKICAgICAgICAgICAgIFZlY3RvcjxDb29raWU+IGRvY0Nvb2tpZXNM aXN0OwotICAgICAgICAgICAgcmF3Q29va2llc0ltcGxlbWVudGVkID0gZ2V0UmF3Q29va2llcyhk b2N1bWVudCwgVVJMKFBhcnNlZFVSTFN0cmluZywgKml0KSwgZG9jQ29va2llc0xpc3QpOworICAg ICAgICAgICAgcmF3Q29va2llc0ltcGxlbWVudGVkID0gZ2V0UmF3Q29va2llcyhkb2N1bWVudCwg VVJMKFBhcnNlZFVSTFN0cmluZywgdXJsKSwgZG9jQ29va2llc0xpc3QpOworCiAgICAgICAgICAg ICBpZiAoIXJhd0Nvb2tpZXNJbXBsZW1lbnRlZCkgewogICAgICAgICAgICAgICAgIC8vIEZJWE1F OiBXZSBuZWVkIGR1cGxpY2F0aW9uIGNoZWNraW5nIGZvciB0aGUgU3RyaW5nIHJlcHJlc2VudGF0 aW9uIG9mIGNvb2tpZXMuCi0gICAgICAgICAgICAgICAgLy8KICAgICAgICAgICAgICAgICAvLyBF eGNlcHRpb25zIGFyZSB0aHJvd24gYnkgY29va2llKCkgaW4gc2FuZGJveGVkIGZyYW1lcy4gVGhh dCB3b24ndCBoYXBwZW4gaGVyZQogICAgICAgICAgICAgICAgIC8vIGJlY2F1c2UgImRvY3VtZW50 IiBpcyB0aGUgZG9jdW1lbnQgb2YgdGhlIG1haW4gZnJhbWUgb2YgdGhlIHBhZ2UuCiAgICAgICAg ICAgICAgICAgc3RyaW5nQ29va2llc0xpc3QuYXBwZW5kKGRvY3VtZW50LT5jb29raWUoQVNTRVJU X05PX0VYQ0VQVElPTikpOwpAQCAtNjI5LDE1ICs2MjYsMTUgQEAgdm9pZCBJbnNwZWN0b3JQYWdl QWdlbnQ6OnNlYXJjaEluUmVzb3VyY2VzKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiB0ZXh0 LCBjb24KIAogICAgIGZvciAoRnJhbWUqIGZyYW1lID0gJm1fcGFnZS0+bWFpbkZyYW1lKCk7IGZy YW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkudHJhdmVyc2VOZXh0KCZtX3BhZ2UtPm1haW5GcmFt ZSgpKSkgewogICAgICAgICBTdHJpbmcgY29udGVudDsKLSAgICAgICAgVmVjdG9yPENhY2hlZFJl c291cmNlKj4gYWxsUmVzb3VyY2VzID0gY2FjaGVkUmVzb3VyY2VzRm9yRnJhbWUoZnJhbWUpOwot ICAgICAgICBmb3IgKFZlY3RvcjxDYWNoZWRSZXNvdXJjZSo+Ojpjb25zdF9pdGVyYXRvciBpdCA9 IGFsbFJlc291cmNlcy5iZWdpbigpOyBpdCAhPSBhbGxSZXNvdXJjZXMuZW5kKCk7ICsraXQpIHsK LSAgICAgICAgICAgIENhY2hlZFJlc291cmNlKiBjYWNoZWRSZXNvdXJjZSA9ICppdDsKKworICAg ICAgICBmb3IgKGF1dG8qIGNhY2hlZFJlc291cmNlIDogY2FjaGVkUmVzb3VyY2VzRm9yRnJhbWUo ZnJhbWUpKSB7CiAgICAgICAgICAgICBpZiAodGV4dENvbnRlbnRGb3JDYWNoZWRSZXNvdXJjZShj YWNoZWRSZXNvdXJjZSwgJmNvbnRlbnQpKSB7CiAgICAgICAgICAgICAgICAgaW50IG1hdGNoZXND b3VudCA9IENvbnRlbnRTZWFyY2hVdGlsaXRpZXM6OmNvdW50UmVndWxhckV4cHJlc3Npb25NYXRj aGVzKHJlZ2V4LCBjb250ZW50KTsKICAgICAgICAgICAgICAgICBpZiAobWF0Y2hlc0NvdW50KQog ICAgICAgICAgICAgICAgICAgICBzZWFyY2hSZXN1bHRzLT5hZGRJdGVtKGJ1aWxkT2JqZWN0Rm9y U2VhcmNoUmVzdWx0KGZyYW1lSWQoZnJhbWUpLCBjYWNoZWRSZXNvdXJjZS0+dXJsKCksIG1hdGNo ZXNDb3VudCkpOwogICAgICAgICAgICAgfQogICAgICAgICB9CisKICAgICAgICAgaWYgKG1haW5S ZXNvdXJjZUNvbnRlbnQoZnJhbWUsIGZhbHNlLCAmY29udGVudCkpIHsKICAgICAgICAgICAgIGlu dCBtYXRjaGVzQ291bnQgPSBDb250ZW50U2VhcmNoVXRpbGl0aWVzOjpjb3VudFJlZ3VsYXJFeHBy ZXNzaW9uTWF0Y2hlcyhyZWdleCwgY29udGVudCk7CiAgICAgICAgICAgICBpZiAobWF0Y2hlc0Nv dW50KQpAQCAtNzQ5LDEwICs3NDYsOSBAQCB2b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6ZGlkQ2xl YXJXaW5kb3dPYmplY3RJbldvcmxkKEZyYW1lKiBmcmFtZSwgRE9NV3JhcHBlcldvcgogICAgICAg ICByZXR1cm47CiAKICAgICBpZiAobV9zY3JpcHRzVG9FdmFsdWF0ZU9uTG9hZCkgewotICAgICAg ICBJbnNwZWN0b3JPYmplY3Q6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fc2NyaXB0c1RvRXZhbHVh dGVPbkxvYWQtPmVuZCgpOwotICAgICAgICBmb3IgKEluc3BlY3Rvck9iamVjdDo6Y29uc3RfaXRl cmF0b3IgaXQgPSBtX3NjcmlwdHNUb0V2YWx1YXRlT25Mb2FkLT5iZWdpbigpOyBpdCAhPSBlbmQ7 ICsraXQpIHsKKyAgICAgICAgZm9yIChhdXRvJiBrZXlWYWx1ZVBhaXIgOiAqbV9zY3JpcHRzVG9F dmFsdWF0ZU9uTG9hZCkgewogICAgICAgICAgICAgU3RyaW5nIHNjcmlwdFRleHQ7Ci0gICAgICAg ICAgICBpZiAoaXQtPnZhbHVlLT5hc1N0cmluZygmc2NyaXB0VGV4dCkpCisgICAgICAgICAgICBp ZiAoa2V5VmFsdWVQYWlyLnZhbHVlLT5hc1N0cmluZygmc2NyaXB0VGV4dCkpCiAgICAgICAgICAg ICAgICAgZnJhbWUtPnNjcmlwdCgpLmV4ZWN1dGVTY3JpcHQoc2NyaXB0VGV4dCk7CiAgICAgICAg IH0KICAgICB9CkBAIC04NjIsOSArODU4LDcgQEAgRG9jdW1lbnRMb2FkZXIqIEluc3BlY3RvclBh Z2VBZ2VudDo6YXNzZXJ0RG9jdW1lbnRMb2FkZXIoRXJyb3JTdHJpbmcqIGVycm9yU3RyaW4KIAog dm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmxvYWRlckRldGFjaGVkRnJvbUZyYW1lKERvY3VtZW50 TG9hZGVyKiBsb2FkZXIpCiB7Ci0gICAgSGFzaE1hcDxEb2N1bWVudExvYWRlciosIFN0cmluZz46 Oml0ZXJhdG9yIGl0ZXJhdG9yID0gbV9sb2FkZXJUb0lkZW50aWZpZXIuZmluZChsb2FkZXIpOwot ICAgIGlmIChpdGVyYXRvciAhPSBtX2xvYWRlclRvSWRlbnRpZmllci5lbmQoKSkKLSAgICAgICAg bV9sb2FkZXJUb0lkZW50aWZpZXIucmVtb3ZlKGl0ZXJhdG9yKTsKKyAgICBtX2xvYWRlclRvSWRl bnRpZmllci5yZW1vdmUobG9hZGVyKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JQYWdlQWdlbnQ6OmZy YW1lU3RhcnRlZExvYWRpbmcoRnJhbWUmIGZyYW1lKQpAQCAtOTc0LDEzICs5NjgsNyBAQCBQYXNz UmVmUHRyPEluc3BlY3Rvcjo6VHlwZUJ1aWxkZXI6OlBhZ2U6OkZyYW1lUmVzb3VyY2VUcmVlPiBJ bnNwZWN0b3JQYWdlQWdlbnQ6OgogICAgICAgICAgLnNldEZyYW1lKGZyYW1lT2JqZWN0KQogICAg ICAgICAgLnNldFJlc291cmNlcyhzdWJyZXNvdXJjZXMpOwogCi0gICAgVmVjdG9yPENhY2hlZFJl c291cmNlKj4gYWxsUmVzb3VyY2VzID0gY2FjaGVkUmVzb3VyY2VzRm9yRnJhbWUoZnJhbWUpOwot ICAgIGZvciAoVmVjdG9yPENhY2hlZFJlc291cmNlKj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gYWxs UmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9IGFsbFJlc291cmNlcy5lbmQoKTsgKytpdCkgewotICAg ICAgICBDYWNoZWRSZXNvdXJjZSogY2FjaGVkUmVzb3VyY2UgPSAqaXQ7Ci0KLSAgICAgICAgaWYg KGNhY2hlZFJlc291cmNlLT5yZXNvdXJjZVJlcXVlc3QoKS5oaWRkZW5Gcm9tSW5zcGVjdG9yKCkp Ci0gICAgICAgICAgICBjb250aW51ZTsKLQorICAgIGZvciAoYXV0byogY2FjaGVkUmVzb3VyY2Ug OiBjYWNoZWRSZXNvdXJjZXNGb3JGcmFtZShmcmFtZSkpIHsKICAgICAgICAgUmVmUHRyPEluc3Bl Y3Rvcjo6VHlwZUJ1aWxkZXI6OlBhZ2U6OkZyYW1lUmVzb3VyY2VUcmVlOjpSZXNvdXJjZXM+IHJl c291cmNlT2JqZWN0ID0gSW5zcGVjdG9yOjpUeXBlQnVpbGRlcjo6UGFnZTo6RnJhbWVSZXNvdXJj ZVRyZWU6OlJlc291cmNlczo6Y3JlYXRlKCkKICAgICAgICAgICAgIC5zZXRVcmwoY2FjaGVkUmVz b3VyY2UtPnVybCgpKQogICAgICAgICAgICAgLnNldFR5cGUoY2FjaGVkUmVzb3VyY2VUeXBlSnNv bigqY2FjaGVkUmVzb3VyY2UpKQo=