138052 2014-10-24 11:57:24 -0700 [Mac] Use modern loops in ResourceRequestCocoa.mm 2014-10-24 15:24:32 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Mac Unspecified RESOLVED FIXED P2 Enhancement --- 1 cdumez cdumez ap barraclough commit-queue darin oldest_to_newest 1044012 0 cdumez 2014-10-24 11:57:24 -0700 Use modern loops in ResourceRequestCocoa.mm and leverage Objective-C's fast enumeration. 1044024 1 240424 cdumez 2014-10-24 12:23:28 -0700 Created attachment 240424 Patch 1044025 2 commit-queue 2014-10-24 12:24:54 -0700 Attachment 240424 did not pass style-queue: ERROR: Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm:88: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1044062 3 240424 darin 2014-10-24 14:19:39 -0700 Comment on attachment 240424 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240424&action=review > Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm:88 > + [[m_nsRequest.get() allHTTPHeaderFields] enumerateKeysAndObjectsUsingBlock: ^(NSString *name, NSString *value, BOOL *) { You don’t need the .get() here. > Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm:95 > + for (NSNumber *encodingFallback in [m_nsRequest.get() contentDispositionEncodingFallbackArray]) { You don’t need the .get() here. > Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm:172 > + RetainPtr<CFStringRef> cfEncodingName = encodingName.createCFString(); > + CFStringEncoding nsEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(cfEncodingName.get())); Reads fine without the local variable. Just encodingName.createCFString().get(). 1044064 4 240436 cdumez 2014-10-24 14:27:29 -0700 Created attachment 240436 Patch 1044065 5 commit-queue 2014-10-24 14:29:45 -0700 Attachment 240436 did not pass style-queue: ERROR: Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm:88: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1044085 6 240436 commit-queue 2014-10-24 15:24:28 -0700 Comment on attachment 240436 Patch Clearing flags on attachment: 240436 Committed r175186: <http://trac.webkit.org/changeset/175186> 1044086 7 commit-queue 2014-10-24 15:24:32 -0700 All reviewed patches have been landed. Closing bug. 240424 2014-10-24 12:23:28 -0700 2014-10-24 14:27:26 -0700 Patch bug-138052-20141024122335.patch text/plain 5891 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1MTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDM2ODJhNjg2ZDUxMGQ3 N2RjNzU1ZmMxMDE4NmNkNzVkYmMxZWYzNC4uODI4N2EyMDdjNjI3NmU0ZmEyNzY1MzA3MDBlMzIw YjYyNmY0YTU2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDE0LTEwLTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW01hY10gVXNlIG1vZGVybiBs b29wcyBpbiBSZXNvdXJjZVJlcXVlc3RDb2NvYS5tbQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4MDUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIG1vZGVybiBsb29wcyBpbiBSZXNvdXJjZVJlcXVl c3RDb2NvYS5tbSBhbmQgbGV2ZXJhZ2UgT2JqZWN0aXZlLUMncworICAgICAgICBmYXN0IGVudW1l cmF0aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9SZXNvdXJjZVJlcXVlc3RDb2NvYS5tbToK KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVSZXNvdXJjZVJlcXVl c3QpOgorICAgICAgICAtIFVzZSBOU0RpY3Rpb25hcnkncyBibG9jay1iYXNlZCBlbnVtZXJhdGlv biBhcyB3ZSBlbnVtZXJhdGUgYm90aCBrZXlzCisgICAgICAgICAgYW5kIHZhbHVlcyBhbmQgdGhp cyBpcyBmYXN0ZXIgdGhhbiB1c2luZyBmYXN0IGVudW1lcmF0aW9uIG9mIHRoZSBrZXlzCisgICAg ICAgICAgdGhlbiBjYWxsaW5nIFtOU0RpY3Rpb25hcnkgb2JqZWN0Rm9yS2V5Ol0KKyAgICAgICAg LSBVc2UgT2JqZWN0aXZlIEMncyBmYXN0IGVudW1lcmF0aW9uIGZvcgorICAgICAgICAgIGNvbnRl bnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheSBhcyB0aGlzIGlzIGZhc3RlciBhbmQg c2hvcnRlcgorICAgICAgICAgIHRoYW4gaW5kZXggYmFzZWQgYWNjZXNzLiBBbHNvIHVzZSByZXNl cnZlQ2FwYWNpdHkoKSAvCisgICAgICAgICAgdW5jaGVja2VkQXBwZW5kKCkgZm9yIG1fcmVzcG9u c2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkKKyAgICAgICAgICBhcyB3 ZSBrbm93IGhvdyBtYW55IGVsZW1lbnRzIHdlcmUgYXJlIGdvaW5nIHRvIGFwcGVuZCBpbiB0aGUg Y29tbW9uCisgICAgICAgICAgY2FzZS4KKworICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0Ojpkb1VwZGF0ZVBsYXRmb3JtUmVxdWVzdCk6CisgICAgICAgIC0gVXNlIGZhc3QgZW51bWVy YXRpb24gZm9yIFtuc1JlcXVlc3QgYWxsSFRUUEhlYWRlckZpZWxkc10gZGljdGlvbmFyeQorICAg ICAgICAgIGtleXMgaW5zdGVhZCBvZiBjYWxsaW5nIFtOU0RpY3Rpb25hcnkgYWxsS2V5c10gYW5k IHRoZW4gZG9pbmcKKyAgICAgICAgICBpbmRleC1iYXNlZCBpdGVyYXRpb24sIHRvIGF2b2lkIGNv cHlpbmcgdGhlIGtleXMgdG8gYSBuZXcgYXJyYXkuCisgICAgICAgICAgQWxzbyBkbyBhIGZvcndh cmQgZW51bWVyYXRpb24gaW5zdGVhZCBvZiBhIHJldmVyc2Ugb25lLiBJIGRvbid0IHNlZQorICAg ICAgICAgIHdoeSBhIGJhY2t3YXJkIGVudW1lcmF0aW9uIHdvdWxkIGJlIG5lY2Vzc2FyeSBoZXJl LiBXZSBhcmUgbm90CisgICAgICAgICAgbW9kaWZ5aW5nIHRoZSBOU0RpY3Rpb25hcnkgd2UgYXJl IGl0ZXJhdGluZyBvdmVyIGFzCisgICAgICAgICAgW25zUmVxdWVzdCBhbGxIVFRQSGVhZGVyRmll bGRzXSBtYWtlcyBhIGNvcHkuCisgICAgICAgIC0gVXNlIGEgbW9kZXJuIEMrKyBsb29wIGZvcgor ICAgICAgICAgIG1fcmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJy YXkuCisKKzIwMTQtMTAtMjQgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKwogICAg ICAgICBBdm9pZCB1bm5lY2Vzc2FyeSBOU1VSTFJlcXVlc3QgY29waWVzIGluIFJlc291cmNlUmVx dWVzdDo6ZG9VcGRhdGVQbGF0Zm9ybVJlcXVlc3QoKSAvIGRvVXBkYXRlUGxhdGZvcm1IVFRQQm9k eSgpCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzgw NDkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9S ZXNvdXJjZVJlcXVlc3RDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y29jb2EvUmVzb3VyY2VSZXF1ZXN0Q29jb2EubW0KaW5kZXggOTI1MmU2NjgxYjBhN2NhODExOWZm NDhiMzc3NWQ4YzRiNGJmYWI1ZS4uODRjZTQxOGEzNTc2ZDIyNGI4YTY5ZTMzMzVhMjQ4YWJhM2I5 ZWNmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9S ZXNvdXJjZVJlcXVlc3RDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2NvY29hL1Jlc291cmNlUmVxdWVzdENvY29hLm1tCkBAIC04NCwyMCArODQsMTggQEAgdm9p ZCBSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUmVzb3VyY2VSZXF1ZXN0KCkKICAgICAgICAgICAg IG1fcHJpb3JpdHkgPSBwcmlvcml0eTsKICAgICB9CiAKLSAgICBOU0RpY3Rpb25hcnkgKmhlYWRl cnMgPSBbbV9uc1JlcXVlc3QuZ2V0KCkgYWxsSFRUUEhlYWRlckZpZWxkc107Ci0gICAgTlNFbnVt ZXJhdG9yICplID0gW2hlYWRlcnMga2V5RW51bWVyYXRvcl07Ci0gICAgTlNTdHJpbmcgKm5hbWU7 CiAgICAgbV9odHRwSGVhZGVyRmllbGRzLmNsZWFyKCk7Ci0gICAgd2hpbGUgKChuYW1lID0gW2Ug bmV4dE9iamVjdF0pKQotICAgICAgICBtX2h0dHBIZWFkZXJGaWVsZHMuc2V0KFN0cmluZyhuYW1l KSwgW2hlYWRlcnMgb2JqZWN0Rm9yS2V5Om5hbWVdKTsKKyAgICBbW21fbnNSZXF1ZXN0LmdldCgp IGFsbEhUVFBIZWFkZXJGaWVsZHNdIGVudW1lcmF0ZUtleXNBbmRPYmplY3RzVXNpbmdCbG9jazog XihOU1N0cmluZyAqbmFtZSwgTlNTdHJpbmcgKnZhbHVlLCBCT09MICopIHsKKyAgICAgICAgbV9o dHRwSGVhZGVyRmllbGRzLnNldChuYW1lLCB2YWx1ZSk7CisgICAgfV07CiAKICAgICBtX3Jlc3Bv bnNlQ29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5LmNsZWFyKCk7CiAgICAg TlNBcnJheSAqZW5jb2RpbmdGYWxsYmFja3MgPSBbbV9uc1JlcXVlc3QuZ2V0KCkgY29udGVudERp c3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5XTsKLSAgICBOU1VJbnRlZ2VyIGNvdW50ID0g W2VuY29kaW5nRmFsbGJhY2tzIGNvdW50XTsKLSAgICBmb3IgKE5TVUludGVnZXIgaSA9IDA7IGkg PCBjb3VudDsgKytpKSB7Ci0gICAgICAgIENGU3RyaW5nRW5jb2RpbmcgZW5jb2RpbmcgPSBDRlN0 cmluZ0NvbnZlcnROU1N0cmluZ0VuY29kaW5nVG9FbmNvZGluZyhbKE5TTnVtYmVyICopW2VuY29k aW5nRmFsbGJhY2tzIG9iamVjdEF0SW5kZXg6aV0gdW5zaWduZWRMb25nVmFsdWVdKTsKKyAgICBt X3Jlc3BvbnNlQ29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5LnJlc2VydmVD YXBhY2l0eShbZW5jb2RpbmdGYWxsYmFja3MgY291bnRdKTsKKyAgICBmb3IgKE5TTnVtYmVyICpl bmNvZGluZ0ZhbGxiYWNrIGluIFttX25zUmVxdWVzdC5nZXQoKSBjb250ZW50RGlzcG9zaXRpb25F bmNvZGluZ0ZhbGxiYWNrQXJyYXldKSB7CisgICAgICAgIENGU3RyaW5nRW5jb2RpbmcgZW5jb2Rp bmcgPSBDRlN0cmluZ0NvbnZlcnROU1N0cmluZ0VuY29kaW5nVG9FbmNvZGluZyhbZW5jb2RpbmdG YWxsYmFjayB1bnNpZ25lZExvbmdWYWx1ZV0pOwogICAgICAgICBpZiAoZW5jb2RpbmcgIT0ga0NG U3RyaW5nRW5jb2RpbmdJbnZhbGlkSWQpCi0gICAgICAgICAgICBtX3Jlc3BvbnNlQ29udGVudERp c3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5LmFwcGVuZChDRlN0cmluZ0NvbnZlcnRFbmNv ZGluZ1RvSUFOQUNoYXJTZXROYW1lKGVuY29kaW5nKSk7CisgICAgICAgICAgICBtX3Jlc3BvbnNl Q29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5LnVuY2hlY2tlZEFwcGVuZChD RlN0cmluZ0NvbnZlcnRFbmNvZGluZ1RvSUFOQUNoYXJTZXROYW1lKGVuY29kaW5nKSk7CiAgICAg fQogCiAjaWYgRU5BQkxFKENBQ0hFX1BBUlRJVElPTklORykKQEAgLTE2MywxNyArMTYxLDE1IEBA IHZvaWQgUmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVBsYXRmb3JtUmVxdWVzdCgpCiAgICAgW25z UmVxdWVzdCBzZXRIVFRQU2hvdWxkSGFuZGxlQ29va2llczphbGxvd0Nvb2tpZXMoKV07CiAKICAg ICAvLyBDYW5ub3QganVzdCB1c2Ugc2V0QWxsSFRUUEhlYWRlckZpZWxkcyBoZXJlLCBiZWNhdXNl IGl0IGRvZXMgbm90IHJlbW92ZSBoZWFkZXJzLgotICAgIE5TQXJyYXkgKm9sZEhlYWRlckZpZWxk TmFtZXMgPSBbW25zUmVxdWVzdCBhbGxIVFRQSGVhZGVyRmllbGRzXSBhbGxLZXlzXTsKLSAgICBm b3IgKHVuc2lnbmVkIGkgPSBbb2xkSGVhZGVyRmllbGROYW1lcyBjb3VudF07IGkgIT0gMDsgLS1p KQotICAgICAgICBbbnNSZXF1ZXN0IHNldFZhbHVlOm5pbCBmb3JIVFRQSGVhZGVyRmllbGQ6W29s ZEhlYWRlckZpZWxkTmFtZXMgb2JqZWN0QXRJbmRleDppIC0gMV1dOworICAgIGZvciAoTlNTdHJp bmcgKm9sZEhlYWRlck5hbWUgaW4gW25zUmVxdWVzdCBhbGxIVFRQSGVhZGVyRmllbGRzXSkKKyAg ICAgICAgW25zUmVxdWVzdCBzZXRWYWx1ZTpuaWwgZm9ySFRUUEhlYWRlckZpZWxkOm9sZEhlYWRl ck5hbWVdOwogICAgIGZvciAoY29uc3QgYXV0byYgaGVhZGVyIDogaHR0cEhlYWRlckZpZWxkcygp KQogICAgICAgICBbbnNSZXF1ZXN0IHNldFZhbHVlOmhlYWRlci52YWx1ZSBmb3JIVFRQSGVhZGVy RmllbGQ6aGVhZGVyLmtleV07CiAKICAgICBOU011dGFibGVBcnJheSAqZW5jb2RpbmdGYWxsYmFj a3MgPSBbTlNNdXRhYmxlQXJyYXkgYXJyYXldOwotICAgIHVuc2lnbmVkIGNvdW50ID0gbV9yZXNw b25zZUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheS5zaXplKCk7Ci0gICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSAhPSBjb3VudDsgKytpKSB7Ci0gICAgICAgIFJldGFpblB0 cjxDRlN0cmluZ1JlZj4gZW5jb2RpbmdOYW1lID0gbV9yZXNwb25zZUNvbnRlbnREaXNwb3NpdGlv bkVuY29kaW5nRmFsbGJhY2tBcnJheVtpXS5jcmVhdGVDRlN0cmluZygpOwotICAgICAgICB1bnNp Z25lZCBsb25nIG5zRW5jb2RpbmcgPSBDRlN0cmluZ0NvbnZlcnRFbmNvZGluZ1RvTlNTdHJpbmdF bmNvZGluZyhDRlN0cmluZ0NvbnZlcnRJQU5BQ2hhclNldE5hbWVUb0VuY29kaW5nKGVuY29kaW5n TmFtZS5nZXQoKSkpOworICAgIGZvciAoY29uc3QgYXV0byYgZW5jb2RpbmdOYW1lIDogbV9yZXNw b25zZUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheSkgeworICAgICAgICBS ZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGNmRW5jb2RpbmdOYW1lID0gZW5jb2RpbmdOYW1lLmNyZWF0 ZUNGU3RyaW5nKCk7CisgICAgICAgIENGU3RyaW5nRW5jb2RpbmcgbnNFbmNvZGluZyA9IENGU3Ry aW5nQ29udmVydEVuY29kaW5nVG9OU1N0cmluZ0VuY29kaW5nKENGU3RyaW5nQ29udmVydElBTkFD aGFyU2V0TmFtZVRvRW5jb2RpbmcoY2ZFbmNvZGluZ05hbWUuZ2V0KCkpKTsKIAogICAgICAgICBp ZiAobnNFbmNvZGluZyAhPSBrQ0ZTdHJpbmdFbmNvZGluZ0ludmFsaWRJZCkKICAgICAgICAgICAg IFtlbmNvZGluZ0ZhbGxiYWNrcyBhZGRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhVbnNpZ25l ZExvbmc6bnNFbmNvZGluZ11dOwo= 240436 2014-10-24 14:27:29 -0700 2014-10-24 15:24:28 -0700 Patch bug-138052-20141024142736.patch text/plain 5790 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1MTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTg3NGQ0MDIzMDg0Y2Zk OWMwNjE2MjM0ZWM4MTMzODc5MDdlYTAxOC4uNjM5OWJkZmU1ZTIxYzRlZWY2YzIzNzI3ZWMzOThj YzdmMDYzZWQzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDE0LTEwLTI0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW01hY10gVXNlIG1vZGVybiBs b29wcyBpbiBSZXNvdXJjZVJlcXVlc3RDb2NvYS5tbQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4MDUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFy aW4gQWRsZXIuCisKKyAgICAgICAgVXNlIG1vZGVybiBsb29wcyBpbiBSZXNvdXJjZVJlcXVlc3RD b2NvYS5tbSBhbmQgbGV2ZXJhZ2UgT2JqZWN0aXZlLUMncworICAgICAgICBmYXN0IGVudW1lcmF0 aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9jb2NvYS9SZXNvdXJjZVJlcXVlc3RDb2NvYS5tbToKKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVSZXNvdXJjZVJlcXVlc3Qp OgorICAgICAgICAtIFVzZSBOU0RpY3Rpb25hcnkncyBibG9jay1iYXNlZCBlbnVtZXJhdGlvbiBh cyB3ZSBlbnVtZXJhdGUgYm90aCBrZXlzCisgICAgICAgICAgYW5kIHZhbHVlcyBhbmQgdGhpcyBp cyBmYXN0ZXIgdGhhbiB1c2luZyBmYXN0IGVudW1lcmF0aW9uIG9mIHRoZSBrZXlzCisgICAgICAg ICAgdGhlbiBjYWxsaW5nIFtOU0RpY3Rpb25hcnkgb2JqZWN0Rm9yS2V5Ol0KKyAgICAgICAgLSBV c2UgT2JqZWN0aXZlIEMncyBmYXN0IGVudW1lcmF0aW9uIGZvcgorICAgICAgICAgIGNvbnRlbnRE aXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheSBhcyB0aGlzIGlzIGZhc3RlciBhbmQgc2hv cnRlcgorICAgICAgICAgIHRoYW4gaW5kZXggYmFzZWQgYWNjZXNzLiBBbHNvIHVzZSByZXNlcnZl Q2FwYWNpdHkoKSAvCisgICAgICAgICAgdW5jaGVja2VkQXBwZW5kKCkgZm9yIG1fcmVzcG9uc2VD b250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkKKyAgICAgICAgICBhcyB3ZSBr bm93IGhvdyBtYW55IGVsZW1lbnRzIHdlcmUgYXJlIGdvaW5nIHRvIGFwcGVuZCBpbiB0aGUgY29t bW9uCisgICAgICAgICAgY2FzZS4KKworICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 Ojpkb1VwZGF0ZVBsYXRmb3JtUmVxdWVzdCk6CisgICAgICAgIC0gVXNlIGZhc3QgZW51bWVyYXRp b24gZm9yIFtuc1JlcXVlc3QgYWxsSFRUUEhlYWRlckZpZWxkc10gZGljdGlvbmFyeQorICAgICAg ICAgIGtleXMgaW5zdGVhZCBvZiBjYWxsaW5nIFtOU0RpY3Rpb25hcnkgYWxsS2V5c10gYW5kIHRo ZW4gZG9pbmcKKyAgICAgICAgICBpbmRleC1iYXNlZCBpdGVyYXRpb24sIHRvIGF2b2lkIGNvcHlp bmcgdGhlIGtleXMgdG8gYSBuZXcgYXJyYXkuCisgICAgICAgICAgQWxzbyBkbyBhIGZvcndhcmQg ZW51bWVyYXRpb24gaW5zdGVhZCBvZiBhIHJldmVyc2Ugb25lLiBJIGRvbid0IHNlZQorICAgICAg ICAgIHdoeSBhIGJhY2t3YXJkIGVudW1lcmF0aW9uIHdvdWxkIGJlIG5lY2Vzc2FyeSBoZXJlLiBX ZSBhcmUgbm90CisgICAgICAgICAgbW9kaWZ5aW5nIHRoZSBOU0RpY3Rpb25hcnkgd2UgYXJlIGl0 ZXJhdGluZyBvdmVyIGFzCisgICAgICAgICAgW25zUmVxdWVzdCBhbGxIVFRQSGVhZGVyRmllbGRz XSBtYWtlcyBhIGNvcHkuCisgICAgICAgIC0gVXNlIGEgbW9kZXJuIEMrKyBsb29wIGZvcgorICAg ICAgICAgIG1fcmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXku CisKKzIwMTQtMTAtMjQgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKwogICAgICAg ICBbTWFjXSBVc2UgTlNTdHJpbmcgQVBJIGluIFF1aWNrTG9va01hYzo6Y29tcHV0ZU5lZWRzUXVp Y2tMb29rUmVzb3VyY2VDYWNoaW5nUXVpcmtzKCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODAzOQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1Jlc291cmNlUmVxdWVzdENvY29hLm1tIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9SZXNvdXJjZVJlcXVlc3RDb2NvYS5tbQpp bmRleCA5MjUyZTY2ODFiMGE3Y2E4MTE5ZmY0OGIzNzc1ZDhjNGI0YmZhYjVlLi4wNDUzODQxMGZh NmRkYzRiMmY0MzE2OTQ2Y2Y3MjY0ZDYxMDdiMWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1Jlc291cmNlUmVxdWVzdENvY29hLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvUmVzb3VyY2VSZXF1ZXN0Q29jb2Eu bW0KQEAgLTg0LDIwICs4NCwxOCBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVSZXNv dXJjZVJlcXVlc3QoKQogICAgICAgICAgICAgbV9wcmlvcml0eSA9IHByaW9yaXR5OwogICAgIH0K IAotICAgIE5TRGljdGlvbmFyeSAqaGVhZGVycyA9IFttX25zUmVxdWVzdC5nZXQoKSBhbGxIVFRQ SGVhZGVyRmllbGRzXTsKLSAgICBOU0VudW1lcmF0b3IgKmUgPSBbaGVhZGVycyBrZXlFbnVtZXJh dG9yXTsKLSAgICBOU1N0cmluZyAqbmFtZTsKICAgICBtX2h0dHBIZWFkZXJGaWVsZHMuY2xlYXIo KTsKLSAgICB3aGlsZSAoKG5hbWUgPSBbZSBuZXh0T2JqZWN0XSkpCi0gICAgICAgIG1faHR0cEhl YWRlckZpZWxkcy5zZXQoU3RyaW5nKG5hbWUpLCBbaGVhZGVycyBvYmplY3RGb3JLZXk6bmFtZV0p OworICAgIFtbbV9uc1JlcXVlc3QgYWxsSFRUUEhlYWRlckZpZWxkc10gZW51bWVyYXRlS2V5c0Fu ZE9iamVjdHNVc2luZ0Jsb2NrOiBeKE5TU3RyaW5nICpuYW1lLCBOU1N0cmluZyAqdmFsdWUsIEJP T0wgKikgeworICAgICAgICBtX2h0dHBIZWFkZXJGaWVsZHMuc2V0KG5hbWUsIHZhbHVlKTsKKyAg ICB9XTsKIAogICAgIG1fcmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNr QXJyYXkuY2xlYXIoKTsKICAgICBOU0FycmF5ICplbmNvZGluZ0ZhbGxiYWNrcyA9IFttX25zUmVx dWVzdC5nZXQoKSBjb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXldOwotICAg IE5TVUludGVnZXIgY291bnQgPSBbZW5jb2RpbmdGYWxsYmFja3MgY291bnRdOwotICAgIGZvciAo TlNVSW50ZWdlciBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKLSAgICAgICAgQ0ZTdHJpbmdFbmNv ZGluZyBlbmNvZGluZyA9IENGU3RyaW5nQ29udmVydE5TU3RyaW5nRW5jb2RpbmdUb0VuY29kaW5n KFsoTlNOdW1iZXIgKilbZW5jb2RpbmdGYWxsYmFja3Mgb2JqZWN0QXRJbmRleDppXSB1bnNpZ25l ZExvbmdWYWx1ZV0pOworICAgIG1fcmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0Zh bGxiYWNrQXJyYXkucmVzZXJ2ZUNhcGFjaXR5KFtlbmNvZGluZ0ZhbGxiYWNrcyBjb3VudF0pOwor ICAgIGZvciAoTlNOdW1iZXIgKmVuY29kaW5nRmFsbGJhY2sgaW4gW21fbnNSZXF1ZXN0IGNvbnRl bnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheV0pIHsKKyAgICAgICAgQ0ZTdHJpbmdF bmNvZGluZyBlbmNvZGluZyA9IENGU3RyaW5nQ29udmVydE5TU3RyaW5nRW5jb2RpbmdUb0VuY29k aW5nKFtlbmNvZGluZ0ZhbGxiYWNrIHVuc2lnbmVkTG9uZ1ZhbHVlXSk7CiAgICAgICAgIGlmIChl bmNvZGluZyAhPSBrQ0ZTdHJpbmdFbmNvZGluZ0ludmFsaWRJZCkKLSAgICAgICAgICAgIG1fcmVz cG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkuYXBwZW5kKENGU3Ry aW5nQ29udmVydEVuY29kaW5nVG9JQU5BQ2hhclNldE5hbWUoZW5jb2RpbmcpKTsKKyAgICAgICAg ICAgIG1fcmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkudW5j aGVja2VkQXBwZW5kKENGU3RyaW5nQ29udmVydEVuY29kaW5nVG9JQU5BQ2hhclNldE5hbWUoZW5j b2RpbmcpKTsKICAgICB9CiAKICNpZiBFTkFCTEUoQ0FDSEVfUEFSVElUSU9OSU5HKQpAQCAtMTYz LDE4ICsxNjEsMTQgQEAgdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUGxhdGZvcm1SZXF1 ZXN0KCkKICAgICBbbnNSZXF1ZXN0IHNldEhUVFBTaG91bGRIYW5kbGVDb29raWVzOmFsbG93Q29v a2llcygpXTsKIAogICAgIC8vIENhbm5vdCBqdXN0IHVzZSBzZXRBbGxIVFRQSGVhZGVyRmllbGRz IGhlcmUsIGJlY2F1c2UgaXQgZG9lcyBub3QgcmVtb3ZlIGhlYWRlcnMuCi0gICAgTlNBcnJheSAq b2xkSGVhZGVyRmllbGROYW1lcyA9IFtbbnNSZXF1ZXN0IGFsbEhUVFBIZWFkZXJGaWVsZHNdIGFs bEtleXNdOwotICAgIGZvciAodW5zaWduZWQgaSA9IFtvbGRIZWFkZXJGaWVsZE5hbWVzIGNvdW50 XTsgaSAhPSAwOyAtLWkpCi0gICAgICAgIFtuc1JlcXVlc3Qgc2V0VmFsdWU6bmlsIGZvckhUVFBI ZWFkZXJGaWVsZDpbb2xkSGVhZGVyRmllbGROYW1lcyBvYmplY3RBdEluZGV4OmkgLSAxXV07Cisg ICAgZm9yIChOU1N0cmluZyAqb2xkSGVhZGVyTmFtZSBpbiBbbnNSZXF1ZXN0IGFsbEhUVFBIZWFk ZXJGaWVsZHNdKQorICAgICAgICBbbnNSZXF1ZXN0IHNldFZhbHVlOm5pbCBmb3JIVFRQSGVhZGVy RmllbGQ6b2xkSGVhZGVyTmFtZV07CiAgICAgZm9yIChjb25zdCBhdXRvJiBoZWFkZXIgOiBodHRw SGVhZGVyRmllbGRzKCkpCiAgICAgICAgIFtuc1JlcXVlc3Qgc2V0VmFsdWU6aGVhZGVyLnZhbHVl IGZvckhUVFBIZWFkZXJGaWVsZDpoZWFkZXIua2V5XTsKIAogICAgIE5TTXV0YWJsZUFycmF5ICpl bmNvZGluZ0ZhbGxiYWNrcyA9IFtOU011dGFibGVBcnJheSBhcnJheV07Ci0gICAgdW5zaWduZWQg Y291bnQgPSBtX3Jlc3BvbnNlQ29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5 LnNpemUoKTsKLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpICE9IGNvdW50OyArK2kpIHsKLSAg ICAgICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBlbmNvZGluZ05hbWUgPSBtX3Jlc3BvbnNlQ29u dGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5W2ldLmNyZWF0ZUNGU3RyaW5nKCk7 Ci0gICAgICAgIHVuc2lnbmVkIGxvbmcgbnNFbmNvZGluZyA9IENGU3RyaW5nQ29udmVydEVuY29k aW5nVG9OU1N0cmluZ0VuY29kaW5nKENGU3RyaW5nQ29udmVydElBTkFDaGFyU2V0TmFtZVRvRW5j b2RpbmcoZW5jb2RpbmdOYW1lLmdldCgpKSk7Ci0KKyAgICBmb3IgKGNvbnN0IGF1dG8mIGVuY29k aW5nTmFtZSA6IG1fcmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJy YXkpIHsKKyAgICAgICAgQ0ZTdHJpbmdFbmNvZGluZyBuc0VuY29kaW5nID0gQ0ZTdHJpbmdDb252 ZXJ0RW5jb2RpbmdUb05TU3RyaW5nRW5jb2RpbmcoQ0ZTdHJpbmdDb252ZXJ0SUFOQUNoYXJTZXRO YW1lVG9FbmNvZGluZyhlbmNvZGluZ05hbWUuY3JlYXRlQ0ZTdHJpbmcoKS5nZXQoKSkpOwogICAg ICAgICBpZiAobnNFbmNvZGluZyAhPSBrQ0ZTdHJpbmdFbmNvZGluZ0ludmFsaWRJZCkKICAgICAg ICAgICAgIFtlbmNvZGluZ0ZhbGxiYWNrcyBhZGRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhV bnNpZ25lZExvbmc6bnNFbmNvZGluZ11dOwogICAgIH0K