44387 2010-08-21 18:44:42 -0700 Add the blob URL member to FormData 2010-08-22 14:38:22 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jianli jianli dimich fishd kinuko levin webkit.review.bot oldest_to_newest 267620 0 jianli 2010-08-21 18:44:42 -0700 When we add a blob into the FormData in out BlobData model, we're adding the blob URL. We need to add the blob URL member to FormDataElement. 267623 1 65040 jianli 2010-08-21 18:52:33 -0700 Created attachment 65040 Proposed Patch 267626 2 webkit.review.bot 2010-08-21 18:54:38 -0700 Attachment 65040 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/platform/network/FormData.h:79: An else if statement should be written as an if statement when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 267631 3 65044 jianli 2010-08-21 19:32:02 -0700 Created attachment 65044 Proposed Patch Fix style error. 267636 4 65044 fishd 2010-08-21 21:02:22 -0700 Comment on attachment 65044 Proposed Patch WebKit/chromium/src/WebHTTPBody.cpp:80 + result.fileStart = 0; nit: these fields exist regardless of whether or not ENABLE(BLOB) is defined, so they probably should be initialized even when ENABLE(BLOB) is not defined. otherwise, LG R=me 267717 5 jianli 2010-08-22 14:38:22 -0700 Committed as http://trac.webkit.org/changeset/65786. 65040 2010-08-21 18:52:33 -0700 2010-08-21 19:32:02 -0700 Proposed Patch 44387 text/plain 8420 jianli ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDRjMzkxYS4uZTBmOTIyMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wOC0yMSAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIHRoZSBibG9iIFVSTCBtZW1iZXIgdG8gRm9ybURhdGEuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDM4NworCisgICAgICAg IFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gdG8gc3dpdGNoIGJsb2IgaW1wbGVtZW50YXRpb24gdG8g dXNpbmcgQmxvYkRhdGEKKyAgICAgICAgbW9kZWwuIFdoZW4gYSBibG9iIGlzIGFkZGVkIHRvIGEg Rm9ybURhdGEsIGl0IGlzIHJlcHJlc2VudGVkIGFzIGEgYmxvYgorICAgICAgICBVUkwgaW4gdGhl IGxpc3QuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZvcm1EYXRhOjphcHBlbmRCbG9iKToKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL0Zvcm1EYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpGb3JtRGF0YUVsZW1lbnQ6OkZv cm1EYXRhRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpGb3JtRGF0YUVsZW1lbnQ6Oik6Cisg ICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcj09KToKKwogMjAxMC0wOC0yMCAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwIGIvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmNwcAppbmRleCAzMTUwNmVhLi5jNjkxOTFi IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5jcHAKQEAgLTIwMCw2ICsyMDAsMTEg QEAgdm9pZCBGb3JtRGF0YTo6YXBwZW5kRmlsZVJhbmdlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUs IGxvbmcgbG9uZyBzdGFydCwgbG9uZyBsb24KIHsKICAgICBtX2VsZW1lbnRzLmFwcGVuZChGb3Jt RGF0YUVsZW1lbnQoZmlsZW5hbWUsIHN0YXJ0LCBsZW5ndGgsIGV4cGVjdGVkTW9kaWZpY2F0aW9u VGltZSwgc2hvdWxkR2VuZXJhdGVGaWxlKSk7CiB9CisKK3ZvaWQgRm9ybURhdGE6OmFwcGVuZEJs b2IoY29uc3QgS1VSTCYgYmxvYlVSTCkKK3sKKyAgICBtX2VsZW1lbnRzLmFwcGVuZChGb3JtRGF0 YUVsZW1lbnQoYmxvYlVSTCkpOworfQogI2VuZGlmCiAKIHZvaWQgRm9ybURhdGE6OmFwcGVuZEtl eVZhbHVlUGFpckl0ZW1zKGNvbnN0IEJsb2JJdGVtTGlzdCYgaXRlbXMsIGNvbnN0IFRleHRFbmNv ZGluZyYgZW5jb2RpbmcsIGJvb2wgaXNNdWx0aVBhcnRGb3JtLCBEb2N1bWVudCogZG9jdW1lbnQp CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuaCBiL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oCmluZGV4IGExOTY0ZTMuLmQzNGZkODEgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oCisrKyBiL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oCkBAIC0yMCw2ICsyMCw3IEBACiAjaWZuZGVm IEZvcm1EYXRhX2gKICNkZWZpbmUgRm9ybURhdGFfaAogCisjaW5jbHVkZSAiS1VSTC5oIgogI2lu Y2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNs dWRlIDx3dGYvUmVmQ291bnRlZC5oPgpAQCAtMzksMTcgKzQwLDI1IEBAIHB1YmxpYzoKIAogI2lm IEVOQUJMRShCTE9CKQogICAgIEZvcm1EYXRhRWxlbWVudChjb25zdCBTdHJpbmcmIGZpbGVuYW1l LCBsb25nIGxvbmcgZmlsZVN0YXJ0LCBsb25nIGxvbmcgZmlsZUxlbmd0aCwgZG91YmxlIGV4cGVj dGVkRmlsZU1vZGlmaWNhdGlvblRpbWUsIGJvb2wgc2hvdWxkR2VuZXJhdGVGaWxlKSA6IG1fdHlw ZShlbmNvZGVkRmlsZSksIG1fZmlsZW5hbWUoZmlsZW5hbWUpLCBtX2ZpbGVTdGFydChmaWxlU3Rh cnQpLCBtX2ZpbGVMZW5ndGgoZmlsZUxlbmd0aCksIG1fZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9u VGltZShleHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lKSwgbV9zaG91bGRHZW5lcmF0ZUZpbGUo c2hvdWxkR2VuZXJhdGVGaWxlKSB7IH0KKyAgICBGb3JtRGF0YUVsZW1lbnQoY29uc3QgS1VSTCYg YmxvYlVSTCkgOiBtX3R5cGUoZW5jb2RlZEJsb2IpLCBtX2Jsb2JVUkwoYmxvYlVSTCkgeyB9CiAj ZWxzZQogICAgIEZvcm1EYXRhRWxlbWVudChjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBib29sIHNo b3VsZEdlbmVyYXRlRmlsZSkgOiBtX3R5cGUoZW5jb2RlZEZpbGUpLCBtX2ZpbGVuYW1lKGZpbGVu YW1lKSwgbV9zaG91bGRHZW5lcmF0ZUZpbGUoc2hvdWxkR2VuZXJhdGVGaWxlKSB7IH0KICNlbmRp ZgogCi0gICAgZW51bSB7IGRhdGEsIGVuY29kZWRGaWxlIH0gbV90eXBlOworICAgIGVudW0gewor ICAgICAgICBkYXRhLAorICAgICAgICBlbmNvZGVkRmlsZQorI2lmIEVOQUJMRShCTE9CKQorICAg ICAgICAsIGVuY29kZWRCbG9iCisjZW5kaWYKKyAgICB9IG1fdHlwZTsKICAgICBWZWN0b3I8Y2hh cj4gbV9kYXRhOwogICAgIFN0cmluZyBtX2ZpbGVuYW1lOwogI2lmIEVOQUJMRShCTE9CKQogICAg IGxvbmcgbG9uZyBtX2ZpbGVTdGFydDsKICAgICBsb25nIGxvbmcgbV9maWxlTGVuZ3RoOwogICAg IGRvdWJsZSBtX2V4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRpbWU7CisgICAgS1VSTCBtX2Jsb2JV Ukw7CiAjZW5kaWYKICAgICBTdHJpbmcgbV9nZW5lcmF0ZWRGaWxlbmFtZTsKICAgICBib29sIG1f c2hvdWxkR2VuZXJhdGVGaWxlOwpAQCAtNjcsMTQgKzc2LDE2IEBAIGlubGluZSBib29sIG9wZXJh dG9yPT0oY29uc3QgRm9ybURhdGFFbGVtZW50JiBhLCBjb25zdCBGb3JtRGF0YUVsZW1lbnQmIGIp CiAKICAgICBpZiAoYS5tX3R5cGUgIT0gYi5tX3R5cGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICBpZiAoYS5tX2RhdGEgIT0gYi5tX2RhdGEpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICBpZiAoYS5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpkYXRhKQorICAgICAgICByZXR1cm4g YS5tX2RhdGEgPT0gYi5tX2RhdGE7CisgICAgZWxzZSBpZiAoYS5tX3R5cGUgPT0gRm9ybURhdGFF bGVtZW50OjplbmNvZGVkRmlsZSkKICNpZiBFTkFCTEUoQkxPQikKLSAgICBpZiAoYS5tX2ZpbGVu YW1lICE9IGIubV9maWxlbmFtZSB8fCBhLm1fZmlsZVN0YXJ0ICE9IGIubV9maWxlU3RhcnQgfHwg YS5tX2ZpbGVMZW5ndGggIT0gYi5tX2ZpbGVMZW5ndGggfHwgYS5tX2V4cGVjdGVkRmlsZU1vZGlm aWNhdGlvblRpbWUgIT0gYi5tX2V4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRpbWUpCisgICAgICAg IHJldHVybiBhLm1fZmlsZW5hbWUgPT0gYi5tX2ZpbGVuYW1lICYmIGEubV9maWxlU3RhcnQgPT0g Yi5tX2ZpbGVTdGFydCAmJiBhLm1fZmlsZUxlbmd0aCA9PSBiLm1fZmlsZUxlbmd0aCAmJiBhLm1f ZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZSA9PSBiLm1fZXhwZWN0ZWRGaWxlTW9kaWZpY2F0 aW9uVGltZTsKKyAgICBlbHNlIGlmIChhLm1fdHlwZSA9PSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29k ZWRCbG9iKQorICAgICAgICByZXR1cm4gYS5tX2Jsb2JVUkwgPT0gYi5tX2Jsb2JVUkw7CiAjZWxz ZQotICAgIGlmIChhLm1fZmlsZW5hbWUgIT0gYi5tX2ZpbGVuYW1lKQorICAgICAgICByZXR1cm4g YS5tX2ZpbGVuYW1lID09IGIubV9maWxlbmFtZTsKICNlbmRpZgotICAgICAgICByZXR1cm4gZmFs c2U7CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTEwMSw2ICsxMTIsNyBAQCBwdWJsaWM6CiAg ICAgdm9pZCBhcHBlbmRGaWxlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIGJvb2wgc2hvdWxkR2Vu ZXJhdGVGaWxlID0gZmFsc2UpOwogI2lmIEVOQUJMRShCTE9CKQogICAgIHZvaWQgYXBwZW5kRmls ZVJhbmdlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUsIGxvbmcgbG9uZyBzdGFydCwgbG9uZyBsb25n IGxlbmd0aCwgZG91YmxlIGV4cGVjdGVkTW9kaWZpY2F0aW9uVGltZSwgYm9vbCBzaG91bGRHZW5l cmF0ZUZpbGUgPSBmYWxzZSk7CisgICAgdm9pZCBhcHBlbmRCbG9iKGNvbnN0IEtVUkwmIGJsb2JV UkwpOwogI2VuZGlmCiAKICAgICB2b2lkIGZsYXR0ZW4oVmVjdG9yPGNoYXI+JikgY29uc3Q7IC8v IG9taXRzIGZpbGVzCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCAxNGMwMTNiLi41NGRkZWQ3IDEwMDY0NAotLS0g YS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wOC0yMSAgSmlhbiBMaSAgPGppYW5saUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIHRoZSBibG9iIFVSTCBtZW1iZXIgdG8gRm9ybURhdGEuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDM4NworCisgICAgICAgIEFzIHRoZSByZXN1 bHQgb2YgYWRkaW5nIHRoZSBibG9iIFVSTCBtZW1iZXIgdG8gdGhlIEZvcm1EYXRhLCB3ZSBuZWVk CisgICAgICAgIHRvIHVwZGF0ZSB0aGUgY29ycmVzcG9uZGluZyBXZWJLaXQgQVBJIGZvciBjaHJv bWl1bS4KKworICAgICAgICAqIHB1YmxpYy9XZWJIVFRQQm9keS5oOgorICAgICAgICAoV2ViS2l0 OjpXZWJIVFRQQm9keTo6RWxlbWVudDo6KToKKyAgICAgICAgKiBzcmMvV2ViSFRUUEJvZHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJIVFRQQm9keTo6ZWxlbWVudEF0KToKKyAgICAgICAgKFdl YktpdDo6V2ViSFRUUEJvZHk6OmFwcGVuZEJsb2IpOgorCiAyMDEwLTA4LTIwICBKYXkgQ2l2ZWxs aSAgPGpjaXZlbGxpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBG aXNoZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkhUVFBCb2R5Lmgg Yi9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkhUVFBCb2R5LmgKaW5kZXggYTdkYzdjOS4uYTJi YjVjZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJIVFRQQm9keS5oCisr KyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSFRUUEJvZHkuaApAQCAtMzUsNiArMzUsNyBA QAogI2luY2x1ZGUgIldlYkZpbGVJbmZvLmgiCiAjaW5jbHVkZSAiV2ViTm9uQ29weWFibGUuaCIK ICNpbmNsdWRlICJXZWJTdHJpbmcuaCIKKyNpbmNsdWRlICJXZWJVUkwuaCIKIAogI2lmIFdFQktJ VF9JTVBMRU1FTlRBVElPTgogbmFtZXNwYWNlIFdlYkNvcmUgeyBjbGFzcyBGb3JtRGF0YTsgfQpA QCAtNDgsMTIgKzQ5LDEzIEBAIGNsYXNzIFdlYkhUVFBCb2R5UHJpdmF0ZTsKIGNsYXNzIFdlYkhU VFBCb2R5IHsKIHB1YmxpYzoKICAgICBzdHJ1Y3QgRWxlbWVudCB7Ci0gICAgICAgIGVudW0geyBU eXBlRGF0YSwgVHlwZUZpbGUgfSB0eXBlOworICAgICAgICBlbnVtIHsgVHlwZURhdGEsIFR5cGVG aWxlLCBUeXBlQmxvYiB9IHR5cGU7CiAgICAgICAgIFdlYkRhdGEgZGF0YTsKICAgICAgICAgV2Vi U3RyaW5nIGZpbGVQYXRoOwogICAgICAgICBsb25nIGxvbmcgZmlsZVN0YXJ0OwogICAgICAgICBs b25nIGxvbmcgZmlsZUxlbmd0aDsgLy8gLTEgbWVhbnMgdG8gdGhlIGVuZCBvZiB0aGUgZmlsZS4K ICAgICAgICAgV2ViRmlsZUluZm8gZmlsZUluZm87CisgICAgICAgIFdlYlVSTCBibG9iVVJMOwog ICAgIH07CiAKICAgICB+V2ViSFRUUEJvZHkoKSB7IHJlc2V0KCk7IH0KQEAgLTg0LDYgKzg2LDcg QEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgdm9pZCBhcHBlbmRGaWxlKGNvbnN0IFdlYlN0cmlu ZyYpOwogICAgIC8vIFBhc3NpbmcgLTEgdG8gZmlsZUxlbmd0aCBtZWFucyB0byB0aGUgZW5kIG9m IHRoZSBmaWxlLgogICAgIFdFQktJVF9BUEkgdm9pZCBhcHBlbmRGaWxlUmFuZ2UoY29uc3QgV2Vi U3RyaW5nJiwgbG9uZyBsb25nIGZpbGVTdGFydCwgbG9uZyBsb25nIGZpbGVMZW5ndGgsIGNvbnN0 IFdlYkZpbGVJbmZvJik7CisgICAgV0VCS0lUX0FQSSB2b2lkIGFwcGVuZEJsb2IoY29uc3QgV2Vi VVJMJik7CiAKICAgICAvLyBJZGVudGlmaWVzIGEgcGFydGljdWxhciBmb3JtIHN1Ym1pc3Npb24g aW5zdGFuY2UuICBBIHZhbHVlIG9mIDAgaXMKICAgICAvLyB1c2VkIHRvIGluZGljYXRlIGFuIHVu c3BlY2lmaWVkIGlkZW50aWZpZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkhUVFBCb2R5LmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSFRUUEJvZHkuY3BwCmluZGV4 IGZhNzUzODcuLjMwOTIzMmIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSFRU UEJvZHkuY3BwCisrKyBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSFRUUEJvZHkuY3BwCkBAIC03 NCwzMSArNzQsMzUgQEAgYm9vbCBXZWJIVFRQQm9keTo6ZWxlbWVudEF0KHNpemVfdCBpbmRleCwg RWxlbWVudCYgcmVzdWx0KSBjb25zdAogCiAgICAgY29uc3QgRm9ybURhdGFFbGVtZW50JiBlbGVt ZW50ID0gbV9wcml2YXRlLT5lbGVtZW50cygpW2luZGV4XTsKIAorICAgIHJlc3VsdC5kYXRhLnJl c2V0KCk7CisgICAgcmVzdWx0LmZpbGVQYXRoLnJlc2V0KCk7CisjaWYgRU5BQkxFKEJMT0IpCisg ICAgcmVzdWx0LmZpbGVTdGFydCA9IDA7CisgICAgcmVzdWx0LmZpbGVMZW5ndGggPSAwOworICAg IHJlc3VsdC5maWxlSW5mby5tb2RpZmljYXRpb25UaW1lID0gMC4wOworICAgIHJlc3VsdC5ibG9i VVJMID0gS1VSTCgpOworI2VuZGlmCisKICAgICBzd2l0Y2ggKGVsZW1lbnQubV90eXBlKSB7CiAg ICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OmRhdGE6CiAgICAgICAgIHJlc3VsdC50eXBlID0gRWxl bWVudDo6VHlwZURhdGE7CiAgICAgICAgIHJlc3VsdC5kYXRhLmFzc2lnbihlbGVtZW50Lm1fZGF0 YS5kYXRhKCksIGVsZW1lbnQubV9kYXRhLnNpemUoKSk7Ci0gICAgICAgIHJlc3VsdC5maWxlUGF0 aC5yZXNldCgpOwotI2lmIEVOQUJMRShCTE9CKQotICAgICAgICByZXN1bHQuZmlsZVN0YXJ0ID0g MDsKLSAgICAgICAgcmVzdWx0LmZpbGVMZW5ndGggPSAwOwotICAgICAgICByZXN1bHQuZmlsZUlu Zm8ubW9kaWZpY2F0aW9uVGltZSA9IDAuMDsKLSNlbmRpZgogICAgICAgICBicmVhazsKICAgICBj YXNlIEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEZpbGU6CiAgICAgICAgIHJlc3VsdC50eXBlID0g RWxlbWVudDo6VHlwZUZpbGU7Ci0gICAgICAgIHJlc3VsdC5kYXRhLnJlc2V0KCk7CiAgICAgICAg IHJlc3VsdC5maWxlUGF0aCA9IGVsZW1lbnQubV9maWxlbmFtZTsKICNpZiBFTkFCTEUoQkxPQikK ICAgICAgICAgcmVzdWx0LmZpbGVTdGFydCA9IGVsZW1lbnQubV9maWxlU3RhcnQ7CiAgICAgICAg IHJlc3VsdC5maWxlTGVuZ3RoID0gZWxlbWVudC5tX2ZpbGVMZW5ndGg7CiAgICAgICAgIHJlc3Vs dC5maWxlSW5mby5tb2RpZmljYXRpb25UaW1lID0gZWxlbWVudC5tX2V4cGVjdGVkRmlsZU1vZGlm aWNhdGlvblRpbWU7Ci0jZWxzZQotICAgICAgICByZXN1bHQuZmlsZVN0YXJ0ID0gMDsKLSAgICAg ICAgcmVzdWx0LmZpbGVMZW5ndGggPSAtMTsKLSAgICAgICAgcmVzdWx0LmZpbGVJbmZvLm1vZGlm aWNhdGlvblRpbWUgPSAwLjA7CiAjZW5kaWYKICAgICAgICAgYnJlYWs7CisjaWYgRU5BQkxFKEJM T0IpCisgICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OmVuY29kZWRCbG9iOgorICAgICAgICByZXN1 bHQudHlwZSA9IEVsZW1lbnQ6OlR5cGVCbG9iOworICAgICAgICByZXN1bHQuYmxvYlVSTCA9IGVs ZW1lbnQubV9ibG9iVVJMOworICAgICAgICBicmVhazsKKyNlbmRpZgogICAgIGRlZmF1bHQ6CiAg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0x MjksNiArMTMzLDE0IEBAIHZvaWQgV2ViSFRUUEJvZHk6OmFwcGVuZEZpbGVSYW5nZShjb25zdCBX ZWJTdHJpbmcmIGZpbGVQYXRoLCBsb25nIGxvbmcgZmlsZVN0YXJ0CiAjZW5kaWYKIH0KIAordm9p ZCBXZWJIVFRQQm9keTo6YXBwZW5kQmxvYihjb25zdCBXZWJVUkwmIGJsb2JVUkwpCit7CisjaWYg RU5BQkxFKEJMT0IpCisgICAgZW5zdXJlTXV0YWJsZSgpOworICAgIG1fcHJpdmF0ZS0+YXBwZW5k QmxvYihibG9iVVJMKTsKKyNlbmRpZgorfQorCiBsb25nIGxvbmcgV2ViSFRUUEJvZHk6OmlkZW50 aWZpZXIoKSBjb25zdAogewogICAgIEFTU0VSVCghaXNOdWxsKCkpOwo= 65044 2010-08-21 19:32:02 -0700 2010-08-21 21:02:22 -0700 Proposed Patch 44387_2 text/plain 8410 jianli ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDRjMzkxYS4uZTBmOTIyMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wOC0yMSAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIHRoZSBibG9iIFVSTCBtZW1iZXIgdG8gRm9ybURhdGEuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NDM4NworCisgICAgICAg IFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gdG8gc3dpdGNoIGJsb2IgaW1wbGVtZW50YXRpb24gdG8g dXNpbmcgQmxvYkRhdGEKKyAgICAgICAgbW9kZWwuIFdoZW4gYSBibG9iIGlzIGFkZGVkIHRvIGEg Rm9ybURhdGEsIGl0IGlzIHJlcHJlc2VudGVkIGFzIGEgYmxvYgorICAgICAgICBVUkwgaW4gdGhl IGxpc3QuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkZvcm1EYXRhOjphcHBlbmRCbG9iKToKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL0Zvcm1EYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpGb3JtRGF0YUVsZW1lbnQ6OkZv cm1EYXRhRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpGb3JtRGF0YUVsZW1lbnQ6Oik6Cisg ICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcj09KToKKwogMjAxMC0wOC0yMCAgSmlhbiBMaSAgPGpp YW5saUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwIGIvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmNwcAppbmRleCAzMTUwNmVhLi5jNjkxOTFi IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwCisrKyBi L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5jcHAKQEAgLTIwMCw2ICsyMDAsMTEg QEAgdm9pZCBGb3JtRGF0YTo6YXBwZW5kRmlsZVJhbmdlKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUs IGxvbmcgbG9uZyBzdGFydCwgbG9uZyBsb24KIHsKICAgICBtX2VsZW1lbnRzLmFwcGVuZChGb3Jt RGF0YUVsZW1lbnQoZmlsZW5hbWUsIHN0YXJ0LCBsZW5ndGgsIGV4cGVjdGVkTW9kaWZpY2F0aW9u VGltZSwgc2hvdWxkR2VuZXJhdGVGaWxlKSk7CiB9CisKK3ZvaWQgRm9ybURhdGE6OmFwcGVuZEJs b2IoY29uc3QgS1VSTCYgYmxvYlVSTCkKK3sKKyAgICBtX2VsZW1lbnRzLmFwcGVuZChGb3JtRGF0 YUVsZW1lbnQoYmxvYlVSTCkpOworfQogI2VuZGlmCiAKIHZvaWQgRm9ybURhdGE6OmFwcGVuZEtl eVZhbHVlUGFpckl0ZW1zKGNvbnN0IEJsb2JJdGVtTGlzdCYgaXRlbXMsIGNvbnN0IFRleHRFbmNv ZGluZyYgZW5jb2RpbmcsIGJvb2wgaXNNdWx0aVBhcnRGb3JtLCBEb2N1bWVudCogZG9jdW1lbnQp CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuaCBiL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oCmluZGV4IGExOTY0ZTMuLmQ3ZmFhODkgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oCisrKyBiL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oCkBAIC0yMCw2ICsyMCw3IEBACiAjaWZuZGVm IEZvcm1EYXRhX2gKICNkZWZpbmUgRm9ybURhdGFfaAogCisjaW5jbHVkZSAiS1VSTC5oIgogI2lu Y2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNs dWRlIDx3dGYvUmVmQ291bnRlZC5oPgpAQCAtMzksMTcgKzQwLDI1IEBAIHB1YmxpYzoKIAogI2lm IEVOQUJMRShCTE9CKQogICAgIEZvcm1EYXRhRWxlbWVudChjb25zdCBTdHJpbmcmIGZpbGVuYW1l LCBsb25nIGxvbmcgZmlsZVN0YXJ0LCBsb25nIGxvbmcgZmlsZUxlbmd0aCwgZG91YmxlIGV4cGVj dGVkRmlsZU1vZGlmaWNhdGlvblRpbWUsIGJvb2wgc2hvdWxkR2VuZXJhdGVGaWxlKSA6IG1fdHlw ZShlbmNvZGVkRmlsZSksIG1fZmlsZW5hbWUoZmlsZW5hbWUpLCBtX2ZpbGVTdGFydChmaWxlU3Rh cnQpLCBtX2ZpbGVMZW5ndGgoZmlsZUxlbmd0aCksIG1fZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9u VGltZShleHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lKSwgbV9zaG91bGRHZW5lcmF0ZUZpbGUo c2hvdWxkR2VuZXJhdGVGaWxlKSB7IH0KKyAgICBGb3JtRGF0YUVsZW1lbnQoY29uc3QgS1VSTCYg YmxvYlVSTCkgOiBtX3R5cGUoZW5jb2RlZEJsb2IpLCBtX2Jsb2JVUkwoYmxvYlVSTCkgeyB9CiAj ZWxzZQogICAgIEZvcm1EYXRhRWxlbWVudChjb25zdCBTdHJpbmcmIGZpbGVuYW1lLCBib29sIHNo b3VsZEdlbmVyYXRlRmlsZSkgOiBtX3R5cGUoZW5jb2RlZEZpbGUpLCBtX2ZpbGVuYW1lKGZpbGVu YW1lKSwgbV9zaG91bGRHZW5lcmF0ZUZpbGUoc2hvdWxkR2VuZXJhdGVGaWxlKSB7IH0KICNlbmRp ZgogCi0gICAgZW51bSB7IGRhdGEsIGVuY29kZWRGaWxlIH0gbV90eXBlOworICAgIGVudW0gewor ICAgICAgICBkYXRhLAorICAgICAgICBlbmNvZGVkRmlsZQorI2lmIEVOQUJMRShCTE9CKQorICAg ICAgICAsIGVuY29kZWRCbG9iCisjZW5kaWYKKyAgICB9IG1fdHlwZTsKICAgICBWZWN0b3I8Y2hh cj4gbV9kYXRhOwogICAgIFN0cmluZyBtX2ZpbGVuYW1lOwogI2lmIEVOQUJMRShCTE9CKQogICAg IGxvbmcgbG9uZyBtX2ZpbGVTdGFydDsKICAgICBsb25nIGxvbmcgbV9maWxlTGVuZ3RoOwogICAg IGRvdWJsZSBtX2V4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRpbWU7CisgICAgS1VSTCBtX2Jsb2JV Ukw7CiAjZW5kaWYKICAgICBTdHJpbmcgbV9nZW5lcmF0ZWRGaWxlbmFtZTsKICAgICBib29sIG1f c2hvdWxkR2VuZXJhdGVGaWxlOwpAQCAtNjcsMTQgKzc2LDE2IEBAIGlubGluZSBib29sIG9wZXJh dG9yPT0oY29uc3QgRm9ybURhdGFFbGVtZW50JiBhLCBjb25zdCBGb3JtRGF0YUVsZW1lbnQmIGIp CiAKICAgICBpZiAoYS5tX3R5cGUgIT0gYi5tX3R5cGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICBpZiAoYS5tX2RhdGEgIT0gYi5tX2RhdGEpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICBpZiAoYS5tX3R5cGUgPT0gRm9ybURhdGFFbGVtZW50OjpkYXRhKQorICAgICAgICByZXR1cm4g YS5tX2RhdGEgPT0gYi5tX2RhdGE7CisgICAgaWYgKGEubV90eXBlID09IEZvcm1EYXRhRWxlbWVu dDo6ZW5jb2RlZEZpbGUpCiAjaWYgRU5BQkxFKEJMT0IpCi0gICAgaWYgKGEubV9maWxlbmFtZSAh PSBiLm1fZmlsZW5hbWUgfHwgYS5tX2ZpbGVTdGFydCAhPSBiLm1fZmlsZVN0YXJ0IHx8IGEubV9m aWxlTGVuZ3RoICE9IGIubV9maWxlTGVuZ3RoIHx8IGEubV9leHBlY3RlZEZpbGVNb2RpZmljYXRp b25UaW1lICE9IGIubV9leHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lKQorICAgICAgICByZXR1 cm4gYS5tX2ZpbGVuYW1lID09IGIubV9maWxlbmFtZSAmJiBhLm1fZmlsZVN0YXJ0ID09IGIubV9m aWxlU3RhcnQgJiYgYS5tX2ZpbGVMZW5ndGggPT0gYi5tX2ZpbGVMZW5ndGggJiYgYS5tX2V4cGVj dGVkRmlsZU1vZGlmaWNhdGlvblRpbWUgPT0gYi5tX2V4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRp bWU7CisgICAgaWYgKGEubV90eXBlID09IEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEJsb2IpCisg ICAgICAgIHJldHVybiBhLm1fYmxvYlVSTCA9PSBiLm1fYmxvYlVSTDsKICNlbHNlCi0gICAgaWYg KGEubV9maWxlbmFtZSAhPSBiLm1fZmlsZW5hbWUpCisgICAgICAgIHJldHVybiBhLm1fZmlsZW5h bWUgPT0gYi5tX2ZpbGVuYW1lOwogI2VuZGlmCi0gICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg IHJldHVybiB0cnVlOwogfQpAQCAtMTAxLDYgKzExMiw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGFw cGVuZEZpbGUoY29uc3QgU3RyaW5nJiBmaWxlbmFtZSwgYm9vbCBzaG91bGRHZW5lcmF0ZUZpbGUg PSBmYWxzZSk7CiAjaWYgRU5BQkxFKEJMT0IpCiAgICAgdm9pZCBhcHBlbmRGaWxlUmFuZ2UoY29u c3QgU3RyaW5nJiBmaWxlbmFtZSwgbG9uZyBsb25nIHN0YXJ0LCBsb25nIGxvbmcgbGVuZ3RoLCBk b3VibGUgZXhwZWN0ZWRNb2RpZmljYXRpb25UaW1lLCBib29sIHNob3VsZEdlbmVyYXRlRmlsZSA9 IGZhbHNlKTsKKyAgICB2b2lkIGFwcGVuZEJsb2IoY29uc3QgS1VSTCYgYmxvYlVSTCk7CiAjZW5k aWYKIAogICAgIHZvaWQgZmxhdHRlbihWZWN0b3I8Y2hhcj4mKSBjb25zdDsgLy8gb21pdHMgZmls ZXMKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCmluZGV4IDE0YzAxM2IuLjU0ZGRlZDcgMTAwNjQ0Ci0tLSBhL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE5IEBACisyMDEwLTA4LTIxICBKaWFuIExpICA8amlhbmxpQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdGhlIGJs b2IgVVJMIG1lbWJlciB0byBGb3JtRGF0YS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQ0Mzg3CisKKyAgICAgICAgQXMgdGhlIHJlc3VsdCBvZiBhZGRp bmcgdGhlIGJsb2IgVVJMIG1lbWJlciB0byB0aGUgRm9ybURhdGEsIHdlIG5lZWQKKyAgICAgICAg dG8gdXBkYXRlIHRoZSBjb3JyZXNwb25kaW5nIFdlYktpdCBBUEkgZm9yIGNocm9taXVtLgorCisg ICAgICAgICogcHVibGljL1dlYkhUVFBCb2R5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYkhUVFBC b2R5OjpFbGVtZW50OjopOgorICAgICAgICAqIHNyYy9XZWJIVFRQQm9keS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkhUVFBCb2R5OjplbGVtZW50QXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJI VFRQQm9keTo6YXBwZW5kQmxvYik6CisKIDIwMTAtMDgtMjAgIEpheSBDaXZlbGxpICA8amNpdmVs bGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KZGlm ZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViSFRUUEJvZHkuaCBiL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViSFRUUEJvZHkuaAppbmRleCBhN2RjN2M5Li5hMmJiNWNkIDEwMDY0 NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkhUVFBCb2R5LmgKKysrIGIvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJIVFRQQm9keS5oCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVk ZSAiV2ViRmlsZUluZm8uaCIKICNpbmNsdWRlICJXZWJOb25Db3B5YWJsZS5oIgogI2luY2x1ZGUg IldlYlN0cmluZy5oIgorI2luY2x1ZGUgIldlYlVSTC5oIgogCiAjaWYgV0VCS0lUX0lNUExFTUVO VEFUSU9OCiBuYW1lc3BhY2UgV2ViQ29yZSB7IGNsYXNzIEZvcm1EYXRhOyB9CkBAIC00OCwxMiAr NDksMTMgQEAgY2xhc3MgV2ViSFRUUEJvZHlQcml2YXRlOwogY2xhc3MgV2ViSFRUUEJvZHkgewog cHVibGljOgogICAgIHN0cnVjdCBFbGVtZW50IHsKLSAgICAgICAgZW51bSB7IFR5cGVEYXRhLCBU eXBlRmlsZSB9IHR5cGU7CisgICAgICAgIGVudW0geyBUeXBlRGF0YSwgVHlwZUZpbGUsIFR5cGVC bG9iIH0gdHlwZTsKICAgICAgICAgV2ViRGF0YSBkYXRhOwogICAgICAgICBXZWJTdHJpbmcgZmls ZVBhdGg7CiAgICAgICAgIGxvbmcgbG9uZyBmaWxlU3RhcnQ7CiAgICAgICAgIGxvbmcgbG9uZyBm aWxlTGVuZ3RoOyAvLyAtMSBtZWFucyB0byB0aGUgZW5kIG9mIHRoZSBmaWxlLgogICAgICAgICBX ZWJGaWxlSW5mbyBmaWxlSW5mbzsKKyAgICAgICAgV2ViVVJMIGJsb2JVUkw7CiAgICAgfTsKIAog ICAgIH5XZWJIVFRQQm9keSgpIHsgcmVzZXQoKTsgfQpAQCAtODQsNiArODYsNyBAQCBwdWJsaWM6 CiAgICAgV0VCS0lUX0FQSSB2b2lkIGFwcGVuZEZpbGUoY29uc3QgV2ViU3RyaW5nJik7CiAgICAg Ly8gUGFzc2luZyAtMSB0byBmaWxlTGVuZ3RoIG1lYW5zIHRvIHRoZSBlbmQgb2YgdGhlIGZpbGUu CiAgICAgV0VCS0lUX0FQSSB2b2lkIGFwcGVuZEZpbGVSYW5nZShjb25zdCBXZWJTdHJpbmcmLCBs b25nIGxvbmcgZmlsZVN0YXJ0LCBsb25nIGxvbmcgZmlsZUxlbmd0aCwgY29uc3QgV2ViRmlsZUlu Zm8mKTsKKyAgICBXRUJLSVRfQVBJIHZvaWQgYXBwZW5kQmxvYihjb25zdCBXZWJVUkwmKTsKIAog ICAgIC8vIElkZW50aWZpZXMgYSBwYXJ0aWN1bGFyIGZvcm0gc3VibWlzc2lvbiBpbnN0YW5jZS4g IEEgdmFsdWUgb2YgMCBpcwogICAgIC8vIHVzZWQgdG8gaW5kaWNhdGUgYW4gdW5zcGVjaWZpZWQg aWRlbnRpZmllci4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSFRUUEJvZHku Y3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIVFRQQm9keS5jcHAKaW5kZXggZmE3NTM4Ny4u MzA5MjMyYiAxMDA2NDQKLS0tIGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIVFRQQm9keS5jcHAK KysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJIVFRQQm9keS5jcHAKQEAgLTc0LDMxICs3NCwz NSBAQCBib29sIFdlYkhUVFBCb2R5OjplbGVtZW50QXQoc2l6ZV90IGluZGV4LCBFbGVtZW50JiBy ZXN1bHQpIGNvbnN0CiAKICAgICBjb25zdCBGb3JtRGF0YUVsZW1lbnQmIGVsZW1lbnQgPSBtX3By aXZhdGUtPmVsZW1lbnRzKClbaW5kZXhdOwogCisgICAgcmVzdWx0LmRhdGEucmVzZXQoKTsKKyAg ICByZXN1bHQuZmlsZVBhdGgucmVzZXQoKTsKKyNpZiBFTkFCTEUoQkxPQikKKyAgICByZXN1bHQu ZmlsZVN0YXJ0ID0gMDsKKyAgICByZXN1bHQuZmlsZUxlbmd0aCA9IDA7CisgICAgcmVzdWx0LmZp bGVJbmZvLm1vZGlmaWNhdGlvblRpbWUgPSAwLjA7CisgICAgcmVzdWx0LmJsb2JVUkwgPSBLVVJM KCk7CisjZW5kaWYKKwogICAgIHN3aXRjaCAoZWxlbWVudC5tX3R5cGUpIHsKICAgICBjYXNlIEZv cm1EYXRhRWxlbWVudDo6ZGF0YToKICAgICAgICAgcmVzdWx0LnR5cGUgPSBFbGVtZW50OjpUeXBl RGF0YTsKICAgICAgICAgcmVzdWx0LmRhdGEuYXNzaWduKGVsZW1lbnQubV9kYXRhLmRhdGEoKSwg ZWxlbWVudC5tX2RhdGEuc2l6ZSgpKTsKLSAgICAgICAgcmVzdWx0LmZpbGVQYXRoLnJlc2V0KCk7 Ci0jaWYgRU5BQkxFKEJMT0IpCi0gICAgICAgIHJlc3VsdC5maWxlU3RhcnQgPSAwOwotICAgICAg ICByZXN1bHQuZmlsZUxlbmd0aCA9IDA7Ci0gICAgICAgIHJlc3VsdC5maWxlSW5mby5tb2RpZmlj YXRpb25UaW1lID0gMC4wOwotI2VuZGlmCiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRm9ybURh dGFFbGVtZW50OjplbmNvZGVkRmlsZToKICAgICAgICAgcmVzdWx0LnR5cGUgPSBFbGVtZW50OjpU eXBlRmlsZTsKLSAgICAgICAgcmVzdWx0LmRhdGEucmVzZXQoKTsKICAgICAgICAgcmVzdWx0LmZp bGVQYXRoID0gZWxlbWVudC5tX2ZpbGVuYW1lOwogI2lmIEVOQUJMRShCTE9CKQogICAgICAgICBy ZXN1bHQuZmlsZVN0YXJ0ID0gZWxlbWVudC5tX2ZpbGVTdGFydDsKICAgICAgICAgcmVzdWx0LmZp bGVMZW5ndGggPSBlbGVtZW50Lm1fZmlsZUxlbmd0aDsKICAgICAgICAgcmVzdWx0LmZpbGVJbmZv Lm1vZGlmaWNhdGlvblRpbWUgPSBlbGVtZW50Lm1fZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGlt ZTsKLSNlbHNlCi0gICAgICAgIHJlc3VsdC5maWxlU3RhcnQgPSAwOwotICAgICAgICByZXN1bHQu ZmlsZUxlbmd0aCA9IC0xOwotICAgICAgICByZXN1bHQuZmlsZUluZm8ubW9kaWZpY2F0aW9uVGlt ZSA9IDAuMDsKICNlbmRpZgogICAgICAgICBicmVhazsKKyNpZiBFTkFCTEUoQkxPQikKKyAgICBj YXNlIEZvcm1EYXRhRWxlbWVudDo6ZW5jb2RlZEJsb2I6CisgICAgICAgIHJlc3VsdC50eXBlID0g RWxlbWVudDo6VHlwZUJsb2I7CisgICAgICAgIHJlc3VsdC5ibG9iVVJMID0gZWxlbWVudC5tX2Js b2JVUkw7CisgICAgICAgIGJyZWFrOworI2VuZGlmCiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNT RVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTEyOSw2ICsxMzMs MTQgQEAgdm9pZCBXZWJIVFRQQm9keTo6YXBwZW5kRmlsZVJhbmdlKGNvbnN0IFdlYlN0cmluZyYg ZmlsZVBhdGgsIGxvbmcgbG9uZyBmaWxlU3RhcnQKICNlbmRpZgogfQogCit2b2lkIFdlYkhUVFBC b2R5OjphcHBlbmRCbG9iKGNvbnN0IFdlYlVSTCYgYmxvYlVSTCkKK3sKKyNpZiBFTkFCTEUoQkxP QikKKyAgICBlbnN1cmVNdXRhYmxlKCk7CisgICAgbV9wcml2YXRlLT5hcHBlbmRCbG9iKGJsb2JV UkwpOworI2VuZGlmCit9CisKIGxvbmcgbG9uZyBXZWJIVFRQQm9keTo6aWRlbnRpZmllcigpIGNv bnN0CiB7CiAgICAgQVNTRVJUKCFpc051bGwoKSk7Cg==