100979 2012-11-01 12:38:54 -0700 Fix HAVE(NETWORK_CFDATA_ARRAY_CALLBACK) build 2012-11-01 15:29:50 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap beidson benjamin japhet joepeck psolanki roger_fong webkit.review.bot oldest_to_newest 756538 0 ap 2012-11-01 12:38:54 -0700 Introduction of ResourceBuffer and some other recent changes have broken NETWORK_CFDATA_ARRAY_CALLBACK build on Mac. 756542 1 171910 ap 2012-11-01 12:42:12 -0700 Created attachment 171910 proposed patch 756548 2 171910 joepeck 2012-11-01 12:46:56 -0700 Comment on attachment 171910 proposed patch r=me 756557 3 171910 buildbot 2012-11-01 13:02:02 -0700 Comment on attachment 171910 proposed patch Attachment 171910 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14661697 756595 4 171923 ap 2012-11-01 13:59:20 -0700 Created attachment 171923 with more fixes Didn't realize that this could not be protected with USE(CF). Anyway, added some more fixes, so this needs new review. 756600 5 171923 joepeck 2012-11-01 14:02:32 -0700 Comment on attachment 171923 with more fixes View in context: https://bugs.webkit.org/attachment.cgi?id=171923&action=review r=me > Source/WTF/wtf/Platform.h:595 > +#define HAVE_NETWORK_CFDATA_ARRAY_CALLBACK 1 // FIXME: All CFNetwork based platforms have this callback now, so it should be USE, not HAVE. I agree. Should you just change this now? Modifying Platform.h to have this comment will cause everyone to need to do a full build anyways. 756603 6 ap 2012-11-01 14:10:42 -0700 I can do a global rename when landing, just didn't want it to complicate review. 756608 7 ap 2012-11-01 14:13:52 -0700 Actually, I'd prefer to do it in a separate change landed immediately after. 756680 8 ap 2012-11-01 15:29:50 -0700 Committed <http://trac.webkit.org/changeset/133232> and <http://trac.webkit.org/changeset/133233> 171910 2012-11-01 12:42:12 -0700 2012-11-01 13:59:20 -0700 proposed patch FixBuild.txt text/plain 3484 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMzIxMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTAxICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBIQVZFKE5FVFdPUktf Q0ZEQVRBX0FSUkFZX0NBTExCQUNLKSBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwOTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VCdWZmZXIuY3BwOiAoV2ViQ29y ZTo6UmVzb3VyY2VCdWZmZXI6OmFwcGVuZCk6CisgICAgICAgICogbG9hZGVyL1Jlc291cmNlQnVm ZmVyLmg6CisgICAgICAgIEFkZGVkIGEgdmVyc2lvbiBvZiBhcHBlbmQoKSB0aGF0IHRha2VzIENG RGF0YVJlZiwgcGFzc2luZyBpdCBkaXJlY3RseSB0byBTaGFyZWRCdWZmZXIuCisKKyAgICAgICAg KiBsb2FkZXIvbWFjL1Jlc291cmNlTG9hZGVyTWFjLm1tOiAoV2ViQ29yZTo6UmVzb3VyY2VMb2Fk ZXI6OmRpZFJlY2VpdmVEYXRhQXJyYXkpOgorICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b24gbm93IHRha2VzIGEgbGVuZ3RoLiBVbmZvcnR1bmF0ZWx5LCB3ZSBkb24ndCBoYXZlIGVuY29k ZWRMZW5ndGgKKyAgICAgICAgaGVyZSwgbWVhbmluZyB0aGF0IHRoZSByZXN1bHRzIHdpbGwgbGlr ZWx5IGJlIGluY29ycmVjdC4KKwogMjAxMi0xMS0wMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBbTWFjXSBDcmFzaCBpbiBSYW5nZTo6ZWRpdGluZ1N0YXJ0UG9z aXRpb24KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUJ1ZmZlci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlQnVmZmVyLmNwcAkocmV2 aXNpb24gMTMzMTg3KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlQnVmZmVyLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTEwLDYgKzExMCwxMSBAQCBDRkRhdGFSZWYgUmVzb3VyY2VC dWZmZXI6OmNyZWF0ZUNGRGF0YSgpCiB7CiAgICAgcmV0dXJuIG1fc2hhcmVkQnVmZmVyLT5jcmVh dGVDRkRhdGEoKTsKIH0KKwordm9pZCBSZXNvdXJjZUJ1ZmZlcjo6YXBwZW5kKENGRGF0YVJlZiBk YXRhUmVmKQoreworICAgIG1fc2hhcmVkQnVmZmVyLT5hcHBlbmQoZGF0YVJlZik7Cit9CiAjZW5k aWYKIAogdm9pZCBSZXNvdXJjZUJ1ZmZlcjo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0 SW5mbyogbWVtb3J5T2JqZWN0SW5mbykgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRl ci9SZXNvdXJjZUJ1ZmZlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9S ZXNvdXJjZUJ1ZmZlci5oCShyZXZpc2lvbiAxMzMxODcpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvUmVzb3VyY2VCdWZmZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNzIsNiArNzIsNyBAQCBwdWJs aWM6CiAjZW5kaWYKICNpZiBVU0UoQ0YpCiAgICAgQ0ZEYXRhUmVmIGNyZWF0ZUNGRGF0YSgpOwor ICAgIHZvaWQgYXBwZW5kKENGRGF0YVJlZik7CiAjZW5kaWYKIAogICAgIHZvaWQgcmVwb3J0TWVt b3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyopIGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUv bG9hZGVyL21hYy9SZXNvdXJjZUxvYWRlck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9sb2FkZXIvbWFjL1Jlc291cmNlTG9hZGVyTWFjLm1tCShyZXZpc2lvbiAxMzMxODcpCisr KyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvbWFjL1Jlc291cmNlTG9hZGVyTWFjLm1tCSh3b3JraW5n IGNvcHkpCkBAIC04Myw3ICs4Myw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVE YXRhQXJyYXkKIAogICAgICAgICBpZiAobV9vcHRpb25zLnNob3VsZEJ1ZmZlckRhdGEgPT0gQnVm ZmVyRGF0YSkgewogICAgICAgICAgICAgaWYgKCFtX3Jlc291cmNlRGF0YSkKLSAgICAgICAgICAg ICAgICBtX3Jlc291cmNlRGF0YSA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKCk7CisgICAgICAgICAg ICAgICAgbV9yZXNvdXJjZURhdGEgPSBSZXNvdXJjZUJ1ZmZlcjo6Y3JlYXRlKCk7CiAgICAgICAg ICAgICBtX3Jlc291cmNlRGF0YS0+YXBwZW5kKGRhdGEpOwogICAgICAgICB9CiAKQEAgLTk3LDcg Kzk3LDE2IEBAIHZvaWQgUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVEYXRhQXJyYXkKIAogdm9p ZCBSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZURhdGFBcnJheShSZXNvdXJjZUhhbmRsZSosIENG QXJyYXlSZWYgZGF0YUFycmF5KQogewotICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tp ZSBjb29raWUgPSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxSZWNlaXZlUmVzb3VyY2VE YXRhKG1fZnJhbWUuZ2V0KCksIGlkZW50aWZpZXIoKSk7CisgICAgQ0ZJbmRleCBhcnJheUNvdW50 ID0gQ0ZBcnJheUdldENvdW50KGRhdGFBcnJheSk7CisgICAgQ0ZJbmRleCBkYXRhTGVuZ3RoID0g MDsKKyAgICBmb3IgKENGSW5kZXggaSA9IDA7IGkgPCBhcnJheUNvdW50OyArK2kpIHsKKyAgICAg ICAgQ0ZEYXRhUmVmIGRhdGEgPSBzdGF0aWNfY2FzdDxDRkRhdGFSZWY+KENGQXJyYXlHZXRWYWx1 ZUF0SW5kZXgoZGF0YUFycmF5LCBpKSk7CisgICAgICAgIGRhdGFMZW5ndGggKz0gQ0ZEYXRhR2V0 TGVuZ3RoKGRhdGEpOworICAgIH0KKworICAgIC8vIEZJWE1FOiBkaWRSZWNlaXZlRGF0YSgpIHBh c3NlcyBlbmNvZGVkIGRhdGEgbGVuZ3RoIHRvIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbiwgYnV0 IGl0IGlzIG5vdCBhdmFpbGFibGUgaGVyZS4KKyAgICAvLyBUaGlzIHByb2JhYmx5IHJlc3VsdHMg aW4gaW5jb3JyZWN0IHNpemUgYmVpbmcgZGlzcGxheWVkIGluIFdlYiBJbnNwZWN0b3IuCisgICAg SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uQ29va2llIGNvb2tpZSA9IEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6d2lsbFJlY2VpdmVSZXNvdXJjZURhdGEobV9mcmFtZS5nZXQoKSwgaWRlbnRpZmll cigpLCBkYXRhTGVuZ3RoKTsKICAgICBkaWRSZWNlaXZlRGF0YUFycmF5KGRhdGFBcnJheSk7CiAg ICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlUmVzb3VyY2VEYXRhKGNvb2tp ZSk7CiB9Cg== 171923 2012-11-01 13:59:20 -0700 2012-11-01 14:02:32 -0700 with more fixes FixBuild.txt text/plain 8529 ap SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMzMyMjEpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDEyLTExLTAxICBBbGV4ZXkgUHJvc2t1cnlha292 ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBIQVZFKE5FVFdPUktfQ0ZEQVRBX0FSUkFZ X0NBTExCQUNLKSBidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTAwOTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiB3dGYvUGxhdGZvcm0uaDogQWRkZWQgYSBGSVhNRSBhYm91dCBIQVZFKE5FVFdP UktfQ0ZEQVRBX0FSUkFZX0NBTExCQUNLKS4KKwogMjAxMi0xMS0wMSAgWXVyeSBTZW1pa2hhdHNr eSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBNZW1vcnkgaW5zdHJ1bWVudGF0aW9u OiByZXBvcnQgbWVtb3J5IG9jY3VwaWVkIGJ5IFJlc291cmNlUmVxdWVzdCBpbnN0ZWFkIG9mIGl0 cyBiYXNlIFJlc291cmNlUmVxdWVzdEJhc2UKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL1BsYXRmb3Jt LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gMTMz MTg3KQorKysgU291cmNlL1dURi93dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtNTky LDcgKzU5Miw3IEBACiAjZGVmaW5lIEVOQUJMRV9PUklFTlRBVElPTl9FVkVOVFMgMQogI2RlZmlu ZSBFTkFCTEVfUkVQQUlOVF9USFJPVFRMSU5HIDEKICNkZWZpbmUgRU5BQkxFX1dFQl9BUkNISVZF IDEKLSNkZWZpbmUgSEFWRV9ORVRXT1JLX0NGREFUQV9BUlJBWV9DQUxMQkFDSyAxCisjZGVmaW5l IEhBVkVfTkVUV09SS19DRkRBVEFfQVJSQVlfQ0FMTEJBQ0sgMSAvLyBGSVhNRTogQWxsIENGTmV0 d29yayBiYXNlZCBwbGF0Zm9ybXMgaGF2ZSB0aGlzIGNhbGxiYWNrIG5vdywgc28gaXQgc2hvdWxk IGJlIFVTRSwgbm90IEhBVkUuCiAjZGVmaW5lIEhBVkVfUFRIUkVBRF9SV0xPQ0sgMQogI2RlZmlu ZSBIQVZFX1JFQURMSU5FIDEKICNkZWZpbmUgV1RGX1VTRV9DRiAxCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShy ZXZpc2lvbiAxMzMyMjEpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwyNCBAQAorMjAxMi0xMS0wMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFw QGFwcGxlLmNvbT4KKworICAgICAgICBGaXggSEFWRShORVRXT1JLX0NGREFUQV9BUlJBWV9DQUxM QkFDSykgYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwMDk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogbG9hZGVyL1Jlc291cmNlQnVmZmVyLmNwcDogKFdlYkNvcmU6OlJlc291cmNlQnVmZmVy OjphcHBlbmQpOgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUJ1ZmZlci5oOgorICAgICAgICBB ZGRlZCBhIHZlcnNpb24gb2YgYXBwZW5kKCkgdGhhdCB0YWtlcyBDRkRhdGFSZWYsIHBhc3Npbmcg aXQgZGlyZWN0bHkgdG8gU2hhcmVkQnVmZmVyLgorCisgICAgICAgICogbG9hZGVyL21hYy9SZXNv dXJjZUxvYWRlck1hYy5tbTogKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0 YUFycmF5KToKKyAgICAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uIG5vdyB0YWtlcyBhIGxl bmd0aC4gVW5mb3J0dW5hdGVseSwgd2UgZG9uJ3QgaGF2ZSBlbmNvZGVkTGVuZ3RoCisgICAgICAg IGhlcmUsIG1lYW5pbmcgdGhhdCB0aGUgcmVzdWx0cyB3aWxsIGxpa2VseSBiZSBpbmNvcnJlY3Qu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6d2lsbENhY2hlUmVzcG9uc2UpOiBSZW1vdmVkIGEgdmVyc2lv biB0aGF0IG5lZWRsZXNzbHkgdXNlZCBkZXByZWNhdGVkIEFQSS4KKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlSGFuZGxlOjpjcmVhdGVDRlVSTENvbm5lY3Rpb24pOiBUaGlzIGNvZGUgYXNzdW1l ZCB0aGF0CisgICAgICAgIEhBVkUoTkVUV09SS19DRkRBVEFfQVJSQVlfQ0FMTEJBQ0spIGFuZCBV U0UoUFJPVEVDVElPTl9TUEFDRV9BVVRIX0NBTExCQUNLKSBhbHdheXMKKyAgICAgICAgY29tZSB0 b2dldGhlci4gQ2hhbmdlZCB0byBjaGVjayBmb3IgdGhlc2Ugc2VwYXJhdGVseS4KKwogMjAxMi0x MS0wMSAgRGF2aWQgQmFydG9uICA8ZGJhcnRvbkBtYXRoc2NyaWJlLmNvbT4KIAogICAgICAgICBS RUdSRVNTSU9OIChyMTI4ODM3KTogbWF0aG1sL3ByZXNlbnRhdGlvbi9zdWJzdXAueGh0bWwgYmVj YW1lIGZsYWt5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VCdWZmZXIuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUJ1ZmZlci5jcHAJ KHJldmlzaW9uIDEzMzE4NykKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUJ1ZmZl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMiw2ICsxMTIsMTMgQEAgQ0ZEYXRhUmVmIFJlc291 cmNlQnVmZmVyOjpjcmVhdGVDRkRhdGEoKQogfQogI2VuZGlmCiAKKyNpZiBIQVZFKE5FVFdPUktf Q0ZEQVRBX0FSUkFZX0NBTExCQUNLKQordm9pZCBSZXNvdXJjZUJ1ZmZlcjo6YXBwZW5kKENGRGF0 YVJlZiBkYXRhUmVmKQoreworICAgIG1fc2hhcmVkQnVmZmVyLT5hcHBlbmQoZGF0YVJlZik7Cit9 CisjZW5kaWYKKwogdm9pZCBSZXNvdXJjZUJ1ZmZlcjo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5 T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykgY29uc3QKIHsKICAgICBNZW1vcnlDbGFzc0lu Zm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCB0aGlzKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUJ1ZmZlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRl ci9SZXNvdXJjZUJ1ZmZlci5oCShyZXZpc2lvbiAxMzMxODcpCisrKyBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvUmVzb3VyY2VCdWZmZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNzMsNiArNzMsOSBAQCBw dWJsaWM6CiAjaWYgVVNFKENGKQogICAgIENGRGF0YVJlZiBjcmVhdGVDRkRhdGEoKTsKICNlbmRp ZgorI2lmIEhBVkUoTkVUV09SS19DRkRBVEFfQVJSQVlfQ0FMTEJBQ0spCisgICAgdm9pZCBhcHBl bmQoQ0ZEYXRhUmVmKTsKKyNlbmRpZgogCiAgICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1v cnlPYmplY3RJbmZvKikgY29uc3Q7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9tYWMv UmVzb3VyY2VMb2FkZXJNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVy L21hYy9SZXNvdXJjZUxvYWRlck1hYy5tbQkocmV2aXNpb24gMTMzMTg3KQorKysgU291cmNlL1dl YkNvcmUvbG9hZGVyL21hYy9SZXNvdXJjZUxvYWRlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAt ODMsNyArODMsNyBAQCB2b2lkIFJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0YUFycmF5CiAK ICAgICAgICAgaWYgKG1fb3B0aW9ucy5zaG91bGRCdWZmZXJEYXRhID09IEJ1ZmZlckRhdGEpIHsK ICAgICAgICAgICAgIGlmICghbV9yZXNvdXJjZURhdGEpCi0gICAgICAgICAgICAgICAgbV9yZXNv dXJjZURhdGEgPSBTaGFyZWRCdWZmZXI6OmNyZWF0ZSgpOworICAgICAgICAgICAgICAgIG1fcmVz b3VyY2VEYXRhID0gUmVzb3VyY2VCdWZmZXI6OmNyZWF0ZSgpOwogICAgICAgICAgICAgbV9yZXNv dXJjZURhdGEtPmFwcGVuZChkYXRhKTsKICAgICAgICAgfQogCkBAIC05Nyw3ICs5NywxNiBAQCB2 b2lkIFJlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlRGF0YUFycmF5CiAKIHZvaWQgUmVzb3VyY2VM b2FkZXI6OmRpZFJlY2VpdmVEYXRhQXJyYXkoUmVzb3VyY2VIYW5kbGUqLCBDRkFycmF5UmVmIGRh dGFBcnJheSkKIHsKLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb25Db29raWUgY29va2llID0g SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVjZWl2ZVJlc291cmNlRGF0YShtX2ZyYW1l LmdldCgpLCBpZGVudGlmaWVyKCkpOworICAgIENGSW5kZXggYXJyYXlDb3VudCA9IENGQXJyYXlH ZXRDb3VudChkYXRhQXJyYXkpOworICAgIENGSW5kZXggZGF0YUxlbmd0aCA9IDA7CisgICAgZm9y IChDRkluZGV4IGkgPSAwOyBpIDwgYXJyYXlDb3VudDsgKytpKSB7CisgICAgICAgIENGRGF0YVJl ZiBkYXRhID0gc3RhdGljX2Nhc3Q8Q0ZEYXRhUmVmPihDRkFycmF5R2V0VmFsdWVBdEluZGV4KGRh dGFBcnJheSwgaSkpOworICAgICAgICBkYXRhTGVuZ3RoICs9IENGRGF0YUdldExlbmd0aChkYXRh KTsKKyAgICB9CisKKyAgICAvLyBGSVhNRTogZGlkUmVjZWl2ZURhdGEoKSBwYXNzZXMgZW5jb2Rl ZCBkYXRhIGxlbmd0aCB0byBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb24sIGJ1dCBpdCBpcyBub3Qg YXZhaWxhYmxlIGhlcmUuCisgICAgLy8gVGhpcyBwcm9iYWJseSByZXN1bHRzIGluIGluY29ycmVj dCBzaXplIGJlaW5nIGRpc3BsYXllZCBpbiBXZWIgSW5zcGVjdG9yLgorICAgIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbkNvb2tpZSBjb29raWUgPSBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Ondp bGxSZWNlaXZlUmVzb3VyY2VEYXRhKG1fZnJhbWUuZ2V0KCksIGlkZW50aWZpZXIoKSwgZGF0YUxl bmd0aCk7CiAgICAgZGlkUmVjZWl2ZURhdGFBcnJheShkYXRhQXJyYXkpOwogICAgIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVJlc291cmNlRGF0YShjb29raWUpOwogfQpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZUhhbmRsZUNGTmV0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jl c291cmNlSGFuZGxlQ0ZOZXQuY3BwCShyZXZpc2lvbiAxMzMxODcpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zNDIsMjAgKzM0MiwxMiBAQCBzdGF0aWMgQ0ZDYWNoZWRVUkxSZXNwb25zZVJlZiB3 aWxsQ2FjaGVSCiAgICAgICAgIGhhbmRsZS0+Y2xpZW50KCktPndpbGxDYWNoZVJlc3BvbnNlKGhh bmRsZSwgcG9saWN5KTsKIAogICAgIGlmIChzdGF0aWNfY2FzdDxDRlVSTENhY2hlU3RvcmFnZVBv bGljeT4ocG9saWN5KSAhPSBDRkNhY2hlZFVSTFJlc3BvbnNlR2V0U3RvcmFnZVBvbGljeShjYWNo ZWRSZXNwb25zZSkpIHsKLSNpZiBIQVZFKE5FVFdPUktfQ0ZEQVRBX0FSUkFZX0NBTExCQUNLKQog ICAgICAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4gcmVjZWl2ZXJEYXRhKEFkb3B0Q0YsIENGQ2Fj aGVkVVJMUmVzcG9uc2VDb3B5UmVjZWl2ZXJEYXRhQXJyYXkoY2FjaGVkUmVzcG9uc2UpKTsKICAg ICAgICAgY2FjaGVkUmVzcG9uc2UgPSBDRkNhY2hlZFVSTFJlc3BvbnNlQ3JlYXRlV2l0aERhdGFB cnJheShrQ0ZBbGxvY2F0b3JEZWZhdWx0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdyYXBwZWRSZXNwb25zZSwKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByZWNlaXZlckRhdGEuZ2V0KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ0ZDYWNoZWRVUkxSZXNwb25zZUdldFVzZXJJ bmZvKGNhY2hlZFJlc3BvbnNlKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxDRlVSTENhY2hlU3RvcmFn ZVBvbGljeT4ocG9saWN5KSk7Ci0jZWxzZQotICAgICAgICBjYWNoZWRSZXNwb25zZSA9IENGQ2Fj aGVkVVJMUmVzcG9uc2VDcmVhdGVXaXRoVXNlckluZm8oa0NGQWxsb2NhdG9yRGVmYXVsdCwgCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB3cmFwcGVkUmVzcG9uc2UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDRkNhY2hlZFVSTFJlc3BvbnNlR2V0UmVjZWl2 ZXJEYXRhKGNhY2hlZFJlc3BvbnNlKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIENGQ2FjaGVkVVJMUmVzcG9uc2VHZXRVc2Vy SW5mbyhjYWNoZWRSZXNwb25zZSksIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8Q0ZVUkxDYWNoZVN0b3Jh Z2VQb2xpY3k+KHBvbGljeSkpOwotI2VuZGlmCiAgICAgfSBlbHNlCiAgICAgICAgIENGUmV0YWlu KGNhY2hlZFJlc3BvbnNlKTsKIApAQCAtNDk5LDExICs0OTEsMTkgQEAgdm9pZCBSZXNvdXJjZUhh bmRsZTo6Y3JlYXRlQ0ZVUkxDb25uZWN0aQogCiAgICAgUmV0YWluUHRyPENGVVJMUmVxdWVzdFJl Zj4gcmVxdWVzdChBZG9wdENGLCBtYWtlRmluYWxSZXF1ZXN0KGZpcnN0UmVxdWVzdCgpLCBzaG91 bGRDb250ZW50U25pZmYpKTsKIAotI2lmIEhBVkUoTkVUV09SS19DRkRBVEFfQVJSQVlfQ0FMTEJB Q0spICYmIFVTRShQUk9URUNUSU9OX1NQQUNFX0FVVEhfQ0FMTEJBQ0spCi0gICAgQ0ZVUkxDb25u ZWN0aW9uQ2xpZW50X1Y2IGNsaWVudCA9IHsgNiwgdGhpcywgMCwgMCwgMCwgV2ViQ29yZTo6d2ls bFNlbmRSZXF1ZXN0LCBkaWRSZWNlaXZlUmVzcG9uc2UsIGRpZFJlY2VpdmVEYXRhLCAwLCBkaWRG aW5pc2hMb2FkaW5nLCBkaWRGYWlsLCB3aWxsQ2FjaGVSZXNwb25zZSwgZGlkUmVjZWl2ZUNoYWxs ZW5nZSwgZGlkU2VuZEJvZHlEYXRhLCBzaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZUNhbGxiYWNr LCAwLCBjYW5SZXNwb25kVG9Qcm90ZWN0aW9uU3BhY2UsIDAsIGRpZFJlY2VpdmVEYXRhQXJyYXl9 OworICAgIENGVVJMQ29ubmVjdGlvbkNsaWVudF9WNiBjbGllbnQgPSB7IDYsIHRoaXMsIDAsIDAs IDAsIFdlYkNvcmU6OndpbGxTZW5kUmVxdWVzdCwgZGlkUmVjZWl2ZVJlc3BvbnNlLCBkaWRSZWNl aXZlRGF0YSwgMCwgZGlkRmluaXNoTG9hZGluZywgZGlkRmFpbCwgd2lsbENhY2hlUmVzcG9uc2Us IGRpZFJlY2VpdmVDaGFsbGVuZ2UsIGRpZFNlbmRCb2R5RGF0YSwgc2hvdWxkVXNlQ3JlZGVudGlh bFN0b3JhZ2VDYWxsYmFjaywgMCwKKyNpZiBVU0UoUFJPVEVDVElPTl9TUEFDRV9BVVRIX0NBTExC QUNLKQorICAgICAgICBjYW5SZXNwb25kVG9Qcm90ZWN0aW9uU3BhY2UsCiAjZWxzZQotICAgIENG VVJMQ29ubmVjdGlvbkNsaWVudF9WMyBjbGllbnQgPSB7IDMsIHRoaXMsIDAsIDAsIDAsIFdlYkNv cmU6OndpbGxTZW5kUmVxdWVzdCwgZGlkUmVjZWl2ZVJlc3BvbnNlLCBkaWRSZWNlaXZlRGF0YSwg MCwgZGlkRmluaXNoTG9hZGluZywgZGlkRmFpbCwgd2lsbENhY2hlUmVzcG9uc2UsIGRpZFJlY2Vp dmVDaGFsbGVuZ2UsIGRpZFNlbmRCb2R5RGF0YSwgc2hvdWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2VD YWxsYmFjaywgMH07CisgICAgICAgIDAsCisjZW5kaWYKKyAgICAgICAgMCwKKyNpZiBIQVZFKE5F VFdPUktfQ0ZEQVRBX0FSUkFZX0NBTExCQUNLKQorICAgICAgICBkaWRSZWNlaXZlRGF0YUFycmF5 CisjZWxzZSAKKyAgICAgICAgMAogI2VuZGlmCisgICAgfTsKICAgICBSZXRhaW5QdHI8Q0ZEaWN0 aW9uYXJ5UmVmPiBjb25uZWN0aW9uUHJvcGVydGllcyhBZG9wdENGLCBjcmVhdGVDb25uZWN0aW9u UHJvcGVydGllcyhzaG91bGRVc2VDcmVkZW50aWFsU3RvcmFnZSkpOwogCiAgICAgZC0+bV9jb25u ZWN0aW9uLmFkb3B0Q0YoQ0ZVUkxDb25uZWN0aW9uQ3JlYXRlV2l0aFByb3BlcnRpZXMoMCwgcmVx dWVzdC5nZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxDRlVSTENvbm5lY3Rpb25DbGllbnQqPigmY2xp ZW50KSwgY29ubmVjdGlvblByb3BlcnRpZXMuZ2V0KCkpKTsK