39285 2010-05-18 04:51:00 -0700 REGRESSION(59659): fast/files/file-reader.html is timing out on all mac bots 2010-05-18 15:26:35 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric jianli dimich hausmann jianli oldest_to_newest 227259 0 eric 2010-05-18 04:51:00 -0700 REGRESSION(59660?): fast/files/file-reader.html is timing out on all mac bots The buildbot logs claim this to be a regression from r59660, but that seems impossible. http://trac.webkit.org/browser/trunk/LayoutTests/fast/files/file-reader.html This test has been flaky on some machines since it was checked in. I think the flake may have finally turned to a permanent failure for unknown reasons. 227261 1 eric 2010-05-18 04:53:11 -0700 This test failed for 59652 59653 59645 59646 in a similar manner. I'm not sure how it's failing on all bots at the same time. Maybe there is some uninitialized memory being tickled here? 227436 2 56401 jianli 2010-05-18 12:42:05 -0700 Created attachment 56401 Proposed Patch 227442 3 56401 eric 2010-05-18 12:51:00 -0700 Comment on attachment 56401 Proposed Patch WebCore/html/FileReader.cpp:237 + default: default: in a switch enum is bad, because it makes the compiler not help you. You can add an ASSERT_NOT_REACHED() to the end of the function if you'd rather. I don't really understand what this change does or why. 227463 4 56407 jianli 2010-05-18 13:21:50 -0700 Created attachment 56407 Proposed Patch Added ASSERT_NOT_REACHED as suggested. 227506 5 56407 dimich 2010-05-18 14:40:13 -0700 Comment on attachment 56407 Proposed Patch r=me 227519 6 jianli 2010-05-18 15:26:35 -0700 Committed as http://trac.webkit.org/changeset/59712. 56401 2010-05-18 12:42:05 -0700 2010-05-18 13:21:50 -0700 Proposed Patch 39285 text/plain 8605 jianli ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyZjgwNzQ5Li42MDcxNTY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTAtMDUt MTggIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBidWcgMzkyODU6IGZhc3QvZmlsZXMvZmls ZS1yZWFkZXIuaHRtbCBpcyB0aW1pbmcgb3V0IG9uIGFsbCBtYWMgYm90cy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MTM1CisKKyAgICAgICAgUmUt ZW5hbGUgdGhlIGZpbGUgcmVhZGVyIHRlc3QuCisKKyAgICAgICAgKiBmYXN0L2ZpbGVzL2ZpbGUt cmVhZGVyLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLmh0 bWw6CisKKzIwMTAtMDUtMTggIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCiAgICAg ICAgIFVucmV2aWV3ZWQuIEJ1aWxkIGZpeC4gRGlzYWJsZSB0ZXN0IGNhc2VzIGluIGZpbGUtcmVh ZGVyLmh0bWwgdGhhdAogICAgICAgICBjYXVzZSB0aW1lLW91dCBpbiBtYWMgYm90IGZvciBmdXJ0 aGVyIGludmVzdGlnYXRpb24uCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZmlsZXMv ZmlsZS1yZWFkZXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJl YWRlci1leHBlY3RlZC50eHQKaW5kZXggMGNhYTcxMy4uOWNkNTNlNSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci1leHBlY3RlZC50eHQKQEAgLTEsNCArMSwzNyBA QAogCitUZXN0IHJlYWRpbmcgYSBub24tZXhpc3RlbnQgZmlsZQorcmVhZHlTdGF0ZTogMAorUmVj ZWl2ZWQgZXJyb3IgZXZlbnQKK3JlYWR5U3RhdGU6IDIKK2Vycm9yIGNvZGU6IDgKK1JlY2VpdmVk IGxvYWRlbmQgZXZlbnQKK1Rlc3QgcmVhZGluZyBhbiBlbXB0eSBmaWxlIGFzIGJpbmFyeSBzdHJp bmcKK3JlYWR5U3RhdGU6IDAKK1JlY2VpdmVkIGxvYWRzdGFydCBldmVudAorcmVhZHlTdGF0ZTog MQorUmVjZWl2ZWQgbG9hZCBldmVudAorcmVhZHlTdGF0ZTogMgorcmVzdWx0IHNpemU6IDAKK3Jl c3VsdDogCitSZWNlaXZlZCBsb2FkZW5kIGV2ZW50CitUZXN0IHJlYWRpbmcgYW4gZW1wdHkgZmls ZSBhcyB0ZXh0CityZWFkeVN0YXRlOiAwCitSZWNlaXZlZCBsb2Fkc3RhcnQgZXZlbnQKK3JlYWR5 U3RhdGU6IDEKK1JlY2VpdmVkIGxvYWQgZXZlbnQKK3JlYWR5U3RhdGU6IDIKK3Jlc3VsdCBzaXpl OiAwCityZXN1bHQ6IAorUmVjZWl2ZWQgbG9hZGVuZCBldmVudAorVGVzdCByZWFkaW5nIGFuIGVt cHR5IGZpbGUgYXMgZGF0YSBVUkwKK3JlYWR5U3RhdGU6IDAKK1JlY2VpdmVkIGxvYWRzdGFydCBl dmVudAorcmVhZHlTdGF0ZTogMQorUmVjZWl2ZWQgbG9hZCBldmVudAorcmVhZHlTdGF0ZTogMgor cmVzdWx0IHNpemU6IDUKK3Jlc3VsdDogZGF0YToKK1JlY2VpdmVkIGxvYWRlbmQgZXZlbnQKIFRl c3QgcmVhZGluZyBhIFVURi04IGZpbGUgYXMgYmluYXJ5IHN0cmluZwogcmVhZHlTdGF0ZTogMAog UmVjZWl2ZWQgbG9hZHN0YXJ0IGV2ZW50CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zp bGVzL2ZpbGUtcmVhZGVyLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2ZpbGUtcmVhZGVy Lmh0bWwKaW5kZXggOGM3M2Y1Mi4uMzlmNWQwNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFz dC9maWxlcy9maWxlLXJlYWRlci5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZmlsZXMvZmls ZS1yZWFkZXIuaHRtbApAQCAtNiwxMSArNiwxMCBAQAogCiA8c2NyaXB0PgogdmFyIHRlc3RDYXNl cyA9IFsKLSAgICAvLyBUaGVzZSB0ZXN0cyB0aW1lIG91dCBvbiB0aGUgbWFjIGJvdC4gU2tpcCBm b3IgbW9yZSBpbnZlc3RpZ2F0aW9uLgotICAgIC8vInRlc3RSZWFkaW5nTm9uRXhpc3RlbnRGaWxl IiwKLSAgICAvLyJ0ZXN0UmVhZGluZ0VtcHR5RmlsZUFzQmluYXJ5U3RyaW5nIiwKLSAgICAvLyJ0 ZXN0UmVhZGluZ0VtcHR5RmlsZUFzVGV4dCIsCi0gICAgLy8idGVzdFJlYWRpbmdFbXB0eUZpbGVB c0RhdGFVUkwiLAorICAgICJ0ZXN0UmVhZGluZ05vbkV4aXN0ZW50RmlsZSIsCisgICAgInRlc3RS ZWFkaW5nRW1wdHlGaWxlQXNCaW5hcnlTdHJpbmciLAorICAgICJ0ZXN0UmVhZGluZ0VtcHR5Rmls ZUFzVGV4dCIsCisgICAgInRlc3RSZWFkaW5nRW1wdHlGaWxlQXNEYXRhVVJMIiwKICAgICAidGVz dFJlYWRpbmdVVEY4RW5jb2RlZEZpbGVBc0JpbmFyeVN0cmluZyIsCiAgICAgInRlc3RSZWFkaW5n VVRGOEVuY29kZWRGaWxlQXNUZXh0IiwKICAgICAidGVzdFJlYWRpbmdVVEYxNkJFQk9NRW5jb2Rl ZEZpbGVBc1RleHQiLApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4OWNkOWMwLi44Yjc4YWQ0IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEwLTA1LTE4 ICBKaWFuIExpICA8amlhbmxpQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggYnVnIDM5Mjg1OiBmYXN0L2ZpbGVzL2ZpbGUt cmVhZGVyLmh0bWwgaXMgdGltaW5nIG91dCBvbiBhbGwgbWFjIGJvdHMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zOTEzNQorCisgICAgICAgIFRoZSB0 aW1lb3V0IGlzIGNhdXNlZCBieSA1OTY1OSB0aGF0IGNoYW5nZWQgdGhlIEdDIHRpbWVyIHRvIDAg YW5kIHRodXMKKyAgICAgICAgdHJpZ2dlcmVkIGEgYnVnIGluIEZpbGVSZWFkZXIgY29kZS4gVGhl IGZpeCBpcyB0byBhZGQgbW9yZSBzdGF0ZXMgc28KKyAgICAgICAgdGhhdCBoYXNQZW5kaW5nQWN0 aXZpdHkoKSBjYW4gZG8gdGhlIGNoZWNrIGNvcnJlY3RseS4KKworICAgICAgICAqIGh0bWwvRmls ZVJlYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGaWxlUmVhZGVyOjpGaWxlUmVhZGVyKToK KyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXI6Omhhc1BlbmRpbmdBY3Rpdml0eSk6CisgICAg ICAgIChXZWJDb3JlOjpGaWxlUmVhZGVyOjpyZWFkSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29y ZTo6RmlsZVJlYWRlcjo6dGVybWluYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXI6 OmRpZFN0YXJ0KToKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXI6OmRpZEdldFNpemUpOgor ICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlcjo6ZGlkUmVhZCk6CisgICAgICAgIChXZWJDb3Jl OjpGaWxlUmVhZGVyOjpkaWRGaW5pc2gpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlcjo6 ZGlkRmFpbCk6CisgICAgICAgIChXZWJDb3JlOjpGaWxlUmVhZGVyOjpyZWFkeVN0YXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXI6OnJlc3VsdCk6CisgICAgICAgICogaHRtbC9GaWxl UmVhZGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpGaWxlUmVhZGVyOjopOgorCiAyMDEwLTA1LTE4 ICBKYWtvYiBQZXRzb3ZpdHMgIDxqcGV0c292aXRzQHJpbS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGlyayBTY2h1bHplLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0ZpbGVSZWFkZXIu Y3BwIGIvV2ViQ29yZS9odG1sL0ZpbGVSZWFkZXIuY3BwCmluZGV4IDY5ZTAxY2UuLmQxYTVkOWUg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9GaWxlUmVhZGVyLmNwcAorKysgYi9XZWJDb3JlL2h0 bWwvRmlsZVJlYWRlci5jcHAKQEAgLTUwLDE0ICs1MCwxMyBAQCBjb25zdCBkb3VibGUgcHJvZ3Jl c3NOb3RpZmljYXRpb25JbnRlcnZhbE1TID0gNTA7CiAKIEZpbGVSZWFkZXI6OkZpbGVSZWFkZXIo U2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCkKICAgICA6IEFjdGl2ZURPTU9iamVjdChj b250ZXh0LCB0aGlzKQotICAgICwgbV9zdGF0ZShFbXB0eSkKKyAgICAsIG1fc3RhdGUoTm9uZSkK ICAgICAsIG1fcmVhZFR5cGUoUmVhZEZpbGVBc0JpbmFyeVN0cmluZykKICAgICAsIG1fcmVzdWx0 KCIiKQogICAgICwgbV9pc1Jhd0RhdGFDb252ZXJ0ZWQoZmFsc2UpCiAgICAgLCBtX2J5dGVzTG9h ZGVkKDApCiAgICAgLCBtX3RvdGFsQnl0ZXMoMCkKICAgICAsIG1fbGFzdFByb2dyZXNzTm90aWZp Y2F0aW9uVGltZU1TKDApCi0gICAgLCBtX2FscmVhZHlTdGFydGVkKGZhbHNlKQogewogICAgIG1f YnVmZmVyLnJlc2l6ZShidWZmZXJTaXplKTsKIH0KQEAgLTY5LDcgKzY4LDcgQEAgRmlsZVJlYWRl cjo6fkZpbGVSZWFkZXIoKQogCiBib29sIEZpbGVSZWFkZXI6Omhhc1BlbmRpbmdBY3Rpdml0eSgp IGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fc3RhdGUgPT0gTG9hZGluZyB8fCBBY3RpdmVET01PYmpl Y3Q6Omhhc1BlbmRpbmdBY3Rpdml0eSgpOworICAgIHJldHVybiAobV9zdGF0ZSAhPSBOb25lICYm IG1fc3RhdGUgIT0gQ29tcGxldGVkKSB8fCBBY3RpdmVET01PYmplY3Q6Omhhc1BlbmRpbmdBY3Rp dml0eSgpOwogfQogCiBib29sIEZpbGVSZWFkZXI6OmNhblN1c3BlbmQoKSBjb25zdApAQCAtMTEw LDExICsxMDksMTIgQEAgdm9pZCBGaWxlUmVhZGVyOjpyZWFkQXNEYXRhVVJMKEZpbGUqIGZpbGUp CiB2b2lkIEZpbGVSZWFkZXI6OnJlYWRJbnRlcm5hbChCbG9iKiBmaWxlQmxvYiwgUmVhZFR5cGUg dHlwZSkKIHsKICAgICAvLyByZWFkQXMqKiogbWV0aG9kcygpIGNhbiBiZSBjYWxsZWQgbXVsdGlw bGUgdGltZXMuIE9ubHkgdGhlIGxhc3QgY2FsbCBiZWZvcmUgdGhlIGFjdHVhbCByZWFkaW5nIGhh cHBlbnMgaXMgcHJvY2Vzc2VkLgotICAgIGlmIChtX2FscmVhZHlTdGFydGVkKQorICAgIGlmICht X3N0YXRlICE9IE5vbmUgJiYgbV9zdGF0ZSAhPSBTdGFydGluZykKICAgICAgICAgcmV0dXJuOwog CiAgICAgbV9maWxlQmxvYiA9IGZpbGVCbG9iOwogICAgIG1fcmVhZFR5cGUgPSB0eXBlOworICAg IG1fc3RhdGUgPSBTdGFydGluZzsKIAogICAgIC8vIFdoZW4gRmlsZVN0cmVhbVByb3h5IGlzIGNy ZWF0ZWQsIEZpbGVSZWFkZXI6OmRpZFN0YXJ0KCkgd2lsbCBnZXQgbm90aWZpZWQgb24gdGhlIEZp bGUgdGhyZWFkIGFuZCB3ZSB3aWxsIHN0YXJ0CiAgICAgLy8gb3BlbmluZyBhbmQgcmVhZGluZyB0 aGUgZmlsZSBzaW5jZSB0aGVuLgpAQCAtMTQyLDE4ICsxNDIsMTggQEAgdm9pZCBGaWxlUmVhZGVy Ojp0ZXJtaW5hdGUoKQogICAgICAgICBtX3N0cmVhbVByb3h5LT5zdG9wKCk7CiAgICAgICAgIG1f c3RyZWFtUHJveHkgPSAwOwogICAgIH0KLSAgICBtX3N0YXRlID0gRG9uZTsKKyAgICBtX3N0YXRl ID0gQ29tcGxldGVkOwogfQogCiB2b2lkIEZpbGVSZWFkZXI6OmRpZFN0YXJ0KCkKIHsKLSAgICBt X2FscmVhZHlTdGFydGVkID0gdHJ1ZTsKKyAgICBtX3N0YXRlID0gT3BlbmluZzsKICAgICBtX3N0 cmVhbVByb3h5LT5vcGVuRm9yUmVhZChtX2ZpbGVCbG9iLmdldCgpKTsKIH0KIAogdm9pZCBGaWxl UmVhZGVyOjpkaWRHZXRTaXplKGxvbmcgbG9uZyBzaXplKQogewotICAgIG1fc3RhdGUgPSBMb2Fk aW5nOworICAgIG1fc3RhdGUgPSBSZWFkaW5nOwogICAgIGZpcmVFdmVudChldmVudE5hbWVzKCku bG9hZHN0YXJ0RXZlbnQpOwogCiAgICAgbV90b3RhbEJ5dGVzID0gc2l6ZTsKQEAgLTE2NSw3ICsx NjUsNyBAQCB2b2lkIEZpbGVSZWFkZXI6OmRpZFJlYWQoY29uc3QgY2hhciogZGF0YSwgaW50IGJ5 dGVzUmVhZCkKICAgICBBU1NFUlQoZGF0YSAmJiBieXRlc1JlYWQpOwogCiAgICAgLy8gQmFpbCBv dXQgaWYgd2UgaGF2ZSBhYm9ydGVkIHRoZSByZWFkaW5nLgotICAgIGlmIChtX3N0YXRlID09IERv bmUpCisgICAgaWYgKG1fc3RhdGUgPT0gQ29tcGxldGVkKQogICAgICAgcmV0dXJuOwogCiAgICAg c3dpdGNoIChtX3JlYWRUeXBlKSB7CkBAIC0xOTgsNyArMTk4LDcgQEAgdm9pZCBGaWxlUmVhZGVy OjpkaWRSZWFkKGNvbnN0IGNoYXIqIGRhdGEsIGludCBieXRlc1JlYWQpCiAKIHZvaWQgRmlsZVJl YWRlcjo6ZGlkRmluaXNoKCkKIHsKLSAgICBtX3N0YXRlID0gRG9uZTsKKyAgICBtX3N0YXRlID0g Q29tcGxldGVkOwogCiAgICAgbV9zdHJlYW1Qcm94eS0+Y2xvc2UoKTsKIApAQCAtMjA4LDcgKzIw OCw3IEBAIHZvaWQgRmlsZVJlYWRlcjo6ZGlkRmluaXNoKCkKIAogdm9pZCBGaWxlUmVhZGVyOjpk aWRGYWlsKEV4Y2VwdGlvbkNvZGUgZWMpCiB7Ci0gICAgbV9zdGF0ZSA9IERvbmU7CisgICAgbV9z dGF0ZSA9IENvbXBsZXRlZDsKICAgICBtX2Vycm9yID0gRmlsZUVycm9yOjpjcmVhdGUoZWMpOwog CiAgICAgbV9zdHJlYW1Qcm94eS0+Y2xvc2UoKTsKQEAgLTIyMyw2ICsyMjMsMjMgQEAgdm9pZCBG aWxlUmVhZGVyOjpmaXJlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0eXBlKQogICAgIGRpc3Bh dGNoRXZlbnQoUHJvZ3Jlc3NFdmVudDo6Y3JlYXRlKHR5cGUsIHRydWUsIHN0YXRpY19jYXN0PHVu c2lnbmVkPihtX2J5dGVzTG9hZGVkKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KG1fdG90YWxCeXRl cykpKTsKIH0KIAorRmlsZVJlYWRlcjo6UmVhZHlTdGF0ZSBGaWxlUmVhZGVyOjpyZWFkeVN0YXRl KCkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKG1fc3RhdGUpIHsKKyAgICBjYXNlIE5vbmU6CisgICAg Y2FzZSBTdGFydGluZzoKKyAgICAgICAgcmV0dXJuIEVtcHR5OworICAgIGNhc2UgT3BlbmluZzoK KyAgICBjYXNlIFJlYWRpbmc6CisgICAgICAgIHJldHVybiBMb2FkaW5nOworICAgIGNhc2UgQ29t cGxldGVkOgorICAgICAgICByZXR1cm4gRG9uZTsKKyAgICBkZWZhdWx0OgorICAgICAgICBBU1NF UlQoZmFsc2UpOworICAgICAgICByZXR1cm4gRW1wdHk7CisgICAgfQorfQorCiBjb25zdCBTY3Jp cHRTdHJpbmcmIEZpbGVSZWFkZXI6OnJlc3VsdCgpCiB7CiAgICAgLy8gSWYgcmVhZGluZyBhcyBi aW5hcnkgc3RyaW5nLCB3ZSBjYW4gcmV0dXJuIHRoZSByZXN1bHQgaW1tZWRpYXRlbHkuCkBAIC0y MzcsNyArMjU0LDcgQEAgY29uc3QgU2NyaXB0U3RyaW5nJiBGaWxlUmVhZGVyOjpyZXN1bHQoKQog ICAgIGlmIChtX3JlYWRUeXBlID09IFJlYWRGaWxlQXNUZXh0KQogICAgICAgICBjb252ZXJ0VG9U ZXh0KCk7CiAgICAgLy8gRm9yIGRhdGEgVVJMLCB3ZSBvbmx5IGRvIHRoZSBjb3ZlcnNpb24gdW50 aWwgd2UgcmVjZWl2ZSBhbGwgdGhlIHJhdyBkYXRhLgotICAgIGVsc2UgaWYgKG1fcmVhZFR5cGUg PT0gUmVhZEZpbGVBc0RhdGFVUkwgJiYgbV9zdGF0ZSA9PSBEb25lKQorICAgIGVsc2UgaWYgKG1f cmVhZFR5cGUgPT0gUmVhZEZpbGVBc0RhdGFVUkwgJiYgbV9zdGF0ZSA9PSBDb21wbGV0ZWQpCiAg ICAgICAgIGNvbnZlcnRUb0RhdGFVUkwoKTsKIAogICAgIHJldHVybiBtX3Jlc3VsdDsKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaHRtbC9GaWxlUmVhZGVyLmggYi9XZWJDb3JlL2h0bWwvRmlsZVJlYWRl ci5oCmluZGV4IGIzMGZhZDcuLjZmYTM2OTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9GaWxl UmVhZGVyLmgKKysrIGIvV2ViQ29yZS9odG1sL0ZpbGVSZWFkZXIuaApAQCAtNzIsNyArNzIsNyBA QCBwdWJsaWM6CiAgICAgdm9pZCByZWFkQXNEYXRhVVJMKEZpbGUqKTsKICAgICB2b2lkIGFib3J0 KCk7CiAKLSAgICBSZWFkeVN0YXRlIHJlYWR5U3RhdGUoKSBjb25zdCB7IHJldHVybiBtX3N0YXRl OyB9CisgICAgUmVhZHlTdGF0ZSByZWFkeVN0YXRlKCkgY29uc3Q7CiAgICAgUGFzc1JlZlB0cjxG aWxlRXJyb3I+IGVycm9yKCkgeyByZXR1cm4gbV9lcnJvcjsgfQogICAgIGNvbnN0IFNjcmlwdFN0 cmluZyYgcmVzdWx0KCk7CiAKQEAgLTEwOCw2ICsxMDgsMTMgQEAgcHJpdmF0ZToKICAgICAgICAg UmVhZEZpbGVBc1RleHQsCiAgICAgICAgIFJlYWRGaWxlQXNEYXRhVVJMCiAgICAgfTsKKyAgICBl bnVtIEludGVybmFsU3RhdGUgeworICAgICAgICBOb25lLAorICAgICAgICBTdGFydGluZywKKyAg ICAgICAgT3BlbmluZywKKyAgICAgICAgUmVhZGluZywKKyAgICAgICAgQ29tcGxldGVkCisgICAg fTsKIAogICAgIEZpbGVSZWFkZXIoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCopOwogCkBAIC0xMjMs NyArMTMwLDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbnZlcnRUb1RleHQoKTsKICAgICB2b2lk IGNvbnZlcnRUb0RhdGFVUkwoKTsKIAotICAgIFJlYWR5U3RhdGUgbV9zdGF0ZTsKKyAgICBJbnRl cm5hbFN0YXRlIG1fc3RhdGU7CiAgICAgRXZlbnRUYXJnZXREYXRhIG1fZXZlbnRUYXJnZXREYXRh OwogCiAgICAgUmVmUHRyPEJsb2I+IG1fZmlsZUJsb2I7CkBAIC0xNTMsNyArMTYwLDYgQEAgcHJp dmF0ZToKICAgICBsb25nIGxvbmcgbV9ieXRlc0xvYWRlZDsKICAgICBsb25nIGxvbmcgbV90b3Rh bEJ5dGVzOwogICAgIGRvdWJsZSBtX2xhc3RQcm9ncmVzc05vdGlmaWNhdGlvblRpbWVNUzsKLSAg ICBib29sIG1fYWxyZWFkeVN0YXJ0ZWQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 56407 2010-05-18 13:21:50 -0700 2010-05-18 14:40:12 -0700 Proposed Patch 39285_3 text/plain 8999 jianli ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3YTc0ZTVjLi5lYmI3MTRkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTAtMDUt MTggIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBidWcgMzkyODU6IGZhc3QvZmlsZXMvZmls ZS1yZWFkZXIuaHRtbCBpcyB0aW1pbmcgb3V0IG9uIGFsbCBtYWMgYm90cy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MTM1CisKKyAgICAgICAgUmUt ZW5hbGUgdGhlIGZpbGUgcmVhZGVyIHRlc3QuCisKKyAgICAgICAgKiBmYXN0L2ZpbGVzL2ZpbGUt cmVhZGVyLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLmh0 bWw6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1NraXBwZWQ6CisKKzIwMTAtMDUtMTggIEppYW4g TGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFVucmV2aWV3ZWQuIEJ1aWxkIGZp eC4gRGlzYWJsZSBmaWxlLXJlYWRlci5odG1sIGZvciBtb3JlIGludmVzdGlnYXRpb24uCiAKICAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvU2tpcHBlZDoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvZmlsZXMvZmlsZS1yZWFkZXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9maWxl cy9maWxlLXJlYWRlci1leHBlY3RlZC50eHQKaW5kZXggMGNhYTcxMy4uOWNkNTNlNSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci1leHBlY3RlZC50eHQKQEAgLTEs NCArMSwzNyBAQAogCitUZXN0IHJlYWRpbmcgYSBub24tZXhpc3RlbnQgZmlsZQorcmVhZHlTdGF0 ZTogMAorUmVjZWl2ZWQgZXJyb3IgZXZlbnQKK3JlYWR5U3RhdGU6IDIKK2Vycm9yIGNvZGU6IDgK K1JlY2VpdmVkIGxvYWRlbmQgZXZlbnQKK1Rlc3QgcmVhZGluZyBhbiBlbXB0eSBmaWxlIGFzIGJp bmFyeSBzdHJpbmcKK3JlYWR5U3RhdGU6IDAKK1JlY2VpdmVkIGxvYWRzdGFydCBldmVudAorcmVh ZHlTdGF0ZTogMQorUmVjZWl2ZWQgbG9hZCBldmVudAorcmVhZHlTdGF0ZTogMgorcmVzdWx0IHNp emU6IDAKK3Jlc3VsdDogCitSZWNlaXZlZCBsb2FkZW5kIGV2ZW50CitUZXN0IHJlYWRpbmcgYW4g ZW1wdHkgZmlsZSBhcyB0ZXh0CityZWFkeVN0YXRlOiAwCitSZWNlaXZlZCBsb2Fkc3RhcnQgZXZl bnQKK3JlYWR5U3RhdGU6IDEKK1JlY2VpdmVkIGxvYWQgZXZlbnQKK3JlYWR5U3RhdGU6IDIKK3Jl c3VsdCBzaXplOiAwCityZXN1bHQ6IAorUmVjZWl2ZWQgbG9hZGVuZCBldmVudAorVGVzdCByZWFk aW5nIGFuIGVtcHR5IGZpbGUgYXMgZGF0YSBVUkwKK3JlYWR5U3RhdGU6IDAKK1JlY2VpdmVkIGxv YWRzdGFydCBldmVudAorcmVhZHlTdGF0ZTogMQorUmVjZWl2ZWQgbG9hZCBldmVudAorcmVhZHlT dGF0ZTogMgorcmVzdWx0IHNpemU6IDUKK3Jlc3VsdDogZGF0YToKK1JlY2VpdmVkIGxvYWRlbmQg ZXZlbnQKIFRlc3QgcmVhZGluZyBhIFVURi04IGZpbGUgYXMgYmluYXJ5IHN0cmluZwogcmVhZHlT dGF0ZTogMAogUmVjZWl2ZWQgbG9hZHN0YXJ0IGV2ZW50CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9mYXN0L2ZpbGVzL2ZpbGUtcmVhZGVyLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZpbGVzL2Zp bGUtcmVhZGVyLmh0bWwKaW5kZXggOGM3M2Y1Mi4uMzlmNWQwNSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvZmFzdC9maWxlcy9maWxlLXJlYWRlci5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv ZmlsZXMvZmlsZS1yZWFkZXIuaHRtbApAQCAtNiwxMSArNiwxMCBAQAogCiA8c2NyaXB0PgogdmFy IHRlc3RDYXNlcyA9IFsKLSAgICAvLyBUaGVzZSB0ZXN0cyB0aW1lIG91dCBvbiB0aGUgbWFjIGJv dC4gU2tpcCBmb3IgbW9yZSBpbnZlc3RpZ2F0aW9uLgotICAgIC8vInRlc3RSZWFkaW5nTm9uRXhp c3RlbnRGaWxlIiwKLSAgICAvLyJ0ZXN0UmVhZGluZ0VtcHR5RmlsZUFzQmluYXJ5U3RyaW5nIiwK LSAgICAvLyJ0ZXN0UmVhZGluZ0VtcHR5RmlsZUFzVGV4dCIsCi0gICAgLy8idGVzdFJlYWRpbmdF bXB0eUZpbGVBc0RhdGFVUkwiLAorICAgICJ0ZXN0UmVhZGluZ05vbkV4aXN0ZW50RmlsZSIsCisg ICAgInRlc3RSZWFkaW5nRW1wdHlGaWxlQXNCaW5hcnlTdHJpbmciLAorICAgICJ0ZXN0UmVhZGlu Z0VtcHR5RmlsZUFzVGV4dCIsCisgICAgInRlc3RSZWFkaW5nRW1wdHlGaWxlQXNEYXRhVVJMIiwK ICAgICAidGVzdFJlYWRpbmdVVEY4RW5jb2RlZEZpbGVBc0JpbmFyeVN0cmluZyIsCiAgICAgInRl c3RSZWFkaW5nVVRGOEVuY29kZWRGaWxlQXNUZXh0IiwKICAgICAidGVzdFJlYWRpbmdVVEYxNkJF Qk9NRW5jb2RlZEZpbGVBc1RleHQiLApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAppbmRleCAwY2Fm NTkwLi5jNDIwNjhkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBl ZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZApAQCAtMTg4LDYgKzE4OCwz IEBAIHNjcm9sbGJhcnMvc2Nyb2xsYmFyLWNsaWNrLWRvZXMtbm90LWJsdXItY29udGVudC5odG1s CiAKICMgSW5kZXhlZERCIGlzIG5vdCB5ZXQgZW5hYmxlZC4KIHN0b3JhZ2UvaW5kZXhlZGRiCi0K LSMgTmVlZCB0byBpbnZlc3RpZ2F0ZSB3aHkgaXQgdGltZXMgb3V0IGluIE1hYyBib3RzLgotZmFz dC9maWxlcy9maWxlLXJlYWRlci5odG1sCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBi L1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDc5NGEyMGIuLjQ0YjFiZGUgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAK KzIwMTAtMDUtMTggIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBidWcgMzkyODU6IGZhc3Qv ZmlsZXMvZmlsZS1yZWFkZXIuaHRtbCBpcyB0aW1pbmcgb3V0IG9uIGFsbCBtYWMgYm90cy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MTM1CisKKyAg ICAgICAgVGhlIHRpbWVvdXQgaXMgY2F1c2VkIGJ5IDU5NjU5IHRoYXQgY2hhbmdlZCB0aGUgR0Mg dGltZXIgdG8gMCBhbmQgdGh1cworICAgICAgICB0cmlnZ2VyZWQgYSBidWcgaW4gRmlsZVJlYWRl ciBjb2RlLiBUaGUgZml4IGlzIHRvIGFkZCBtb3JlIHN0YXRlcyBzbworICAgICAgICB0aGF0IGhh c1BlbmRpbmdBY3Rpdml0eSgpIGNhbiBkbyB0aGUgY2hlY2sgY29ycmVjdGx5LgorCisgICAgICAg ICogaHRtbC9GaWxlUmVhZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXI6OkZp bGVSZWFkZXIpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlcjo6aGFzUGVuZGluZ0FjdGl2 aXR5KToKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXI6OnJlYWRJbnRlcm5hbCk6CisgICAg ICAgIChXZWJDb3JlOjpGaWxlUmVhZGVyOjp0ZXJtaW5hdGUpOgorICAgICAgICAoV2ViQ29yZTo6 RmlsZVJlYWRlcjo6ZGlkU3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlcjo6ZGlk R2V0U2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpGaWxlUmVhZGVyOjpkaWRSZWFkKToKKyAgICAg ICAgKFdlYkNvcmU6OkZpbGVSZWFkZXI6OmRpZEZpbmlzaCk6CisgICAgICAgIChXZWJDb3JlOjpG aWxlUmVhZGVyOjpkaWRGYWlsKToKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXI6OnJlYWR5 U3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlcjo6cmVzdWx0KToKKyAgICAgICAg KiBodG1sL0ZpbGVSZWFkZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVSZWFkZXI6Oik6CisK IDIwMTAtMDUtMTggIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBBbm90 aGVyIGF0dGVtcHQgdG8gZml4IHRoZSBidWlsZC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9G aWxlUmVhZGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9GaWxlUmVhZGVyLmNwcAppbmRleCA2OWUwMWNl Li42YjRmMDY2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvRmlsZVJlYWRlci5jcHAKKysrIGIv V2ViQ29yZS9odG1sL0ZpbGVSZWFkZXIuY3BwCkBAIC01MCwxNCArNTAsMTMgQEAgY29uc3QgZG91 YmxlIHByb2dyZXNzTm90aWZpY2F0aW9uSW50ZXJ2YWxNUyA9IDUwOwogCiBGaWxlUmVhZGVyOjpG aWxlUmVhZGVyKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQpCiAgICAgOiBBY3RpdmVE T01PYmplY3QoY29udGV4dCwgdGhpcykKLSAgICAsIG1fc3RhdGUoRW1wdHkpCisgICAgLCBtX3N0 YXRlKE5vbmUpCiAgICAgLCBtX3JlYWRUeXBlKFJlYWRGaWxlQXNCaW5hcnlTdHJpbmcpCiAgICAg LCBtX3Jlc3VsdCgiIikKICAgICAsIG1faXNSYXdEYXRhQ29udmVydGVkKGZhbHNlKQogICAgICwg bV9ieXRlc0xvYWRlZCgwKQogICAgICwgbV90b3RhbEJ5dGVzKDApCiAgICAgLCBtX2xhc3RQcm9n cmVzc05vdGlmaWNhdGlvblRpbWVNUygwKQotICAgICwgbV9hbHJlYWR5U3RhcnRlZChmYWxzZSkK IHsKICAgICBtX2J1ZmZlci5yZXNpemUoYnVmZmVyU2l6ZSk7CiB9CkBAIC02OSw3ICs2OCw3IEBA IEZpbGVSZWFkZXI6On5GaWxlUmVhZGVyKCkKIAogYm9vbCBGaWxlUmVhZGVyOjpoYXNQZW5kaW5n QWN0aXZpdHkoKSBjb25zdAogewotICAgIHJldHVybiBtX3N0YXRlID09IExvYWRpbmcgfHwgQWN0 aXZlRE9NT2JqZWN0OjpoYXNQZW5kaW5nQWN0aXZpdHkoKTsKKyAgICByZXR1cm4gKG1fc3RhdGUg IT0gTm9uZSAmJiBtX3N0YXRlICE9IENvbXBsZXRlZCkgfHwgQWN0aXZlRE9NT2JqZWN0OjpoYXNQ ZW5kaW5nQWN0aXZpdHkoKTsKIH0KIAogYm9vbCBGaWxlUmVhZGVyOjpjYW5TdXNwZW5kKCkgY29u c3QKQEAgLTExMCwxMSArMTA5LDEyIEBAIHZvaWQgRmlsZVJlYWRlcjo6cmVhZEFzRGF0YVVSTChG aWxlKiBmaWxlKQogdm9pZCBGaWxlUmVhZGVyOjpyZWFkSW50ZXJuYWwoQmxvYiogZmlsZUJsb2Is IFJlYWRUeXBlIHR5cGUpCiB7CiAgICAgLy8gcmVhZEFzKioqIG1ldGhvZHMoKSBjYW4gYmUgY2Fs bGVkIG11bHRpcGxlIHRpbWVzLiBPbmx5IHRoZSBsYXN0IGNhbGwgYmVmb3JlIHRoZSBhY3R1YWwg cmVhZGluZyBoYXBwZW5zIGlzIHByb2Nlc3NlZC4KLSAgICBpZiAobV9hbHJlYWR5U3RhcnRlZCkK KyAgICBpZiAobV9zdGF0ZSAhPSBOb25lICYmIG1fc3RhdGUgIT0gU3RhcnRpbmcpCiAgICAgICAg IHJldHVybjsKIAogICAgIG1fZmlsZUJsb2IgPSBmaWxlQmxvYjsKICAgICBtX3JlYWRUeXBlID0g dHlwZTsKKyAgICBtX3N0YXRlID0gU3RhcnRpbmc7CiAKICAgICAvLyBXaGVuIEZpbGVTdHJlYW1Q cm94eSBpcyBjcmVhdGVkLCBGaWxlUmVhZGVyOjpkaWRTdGFydCgpIHdpbGwgZ2V0IG5vdGlmaWVk IG9uIHRoZSBGaWxlIHRocmVhZCBhbmQgd2Ugd2lsbCBzdGFydAogICAgIC8vIG9wZW5pbmcgYW5k IHJlYWRpbmcgdGhlIGZpbGUgc2luY2UgdGhlbi4KQEAgLTE0MiwxOCArMTQyLDE4IEBAIHZvaWQg RmlsZVJlYWRlcjo6dGVybWluYXRlKCkKICAgICAgICAgbV9zdHJlYW1Qcm94eS0+c3RvcCgpOwog ICAgICAgICBtX3N0cmVhbVByb3h5ID0gMDsKICAgICB9Ci0gICAgbV9zdGF0ZSA9IERvbmU7Cisg ICAgbV9zdGF0ZSA9IENvbXBsZXRlZDsKIH0KIAogdm9pZCBGaWxlUmVhZGVyOjpkaWRTdGFydCgp CiB7Ci0gICAgbV9hbHJlYWR5U3RhcnRlZCA9IHRydWU7CisgICAgbV9zdGF0ZSA9IE9wZW5pbmc7 CiAgICAgbV9zdHJlYW1Qcm94eS0+b3BlbkZvclJlYWQobV9maWxlQmxvYi5nZXQoKSk7CiB9CiAK IHZvaWQgRmlsZVJlYWRlcjo6ZGlkR2V0U2l6ZShsb25nIGxvbmcgc2l6ZSkKIHsKLSAgICBtX3N0 YXRlID0gTG9hZGluZzsKKyAgICBtX3N0YXRlID0gUmVhZGluZzsKICAgICBmaXJlRXZlbnQoZXZl bnROYW1lcygpLmxvYWRzdGFydEV2ZW50KTsKIAogICAgIG1fdG90YWxCeXRlcyA9IHNpemU7CkBA IC0xNjUsNyArMTY1LDcgQEAgdm9pZCBGaWxlUmVhZGVyOjpkaWRSZWFkKGNvbnN0IGNoYXIqIGRh dGEsIGludCBieXRlc1JlYWQpCiAgICAgQVNTRVJUKGRhdGEgJiYgYnl0ZXNSZWFkKTsKIAogICAg IC8vIEJhaWwgb3V0IGlmIHdlIGhhdmUgYWJvcnRlZCB0aGUgcmVhZGluZy4KLSAgICBpZiAobV9z dGF0ZSA9PSBEb25lKQorICAgIGlmIChtX3N0YXRlID09IENvbXBsZXRlZCkKICAgICAgIHJldHVy bjsKIAogICAgIHN3aXRjaCAobV9yZWFkVHlwZSkgewpAQCAtMTk4LDcgKzE5OCw3IEBAIHZvaWQg RmlsZVJlYWRlcjo6ZGlkUmVhZChjb25zdCBjaGFyKiBkYXRhLCBpbnQgYnl0ZXNSZWFkKQogCiB2 b2lkIEZpbGVSZWFkZXI6OmRpZEZpbmlzaCgpCiB7Ci0gICAgbV9zdGF0ZSA9IERvbmU7CisgICAg bV9zdGF0ZSA9IENvbXBsZXRlZDsKIAogICAgIG1fc3RyZWFtUHJveHktPmNsb3NlKCk7CiAKQEAg LTIwOCw3ICsyMDgsNyBAQCB2b2lkIEZpbGVSZWFkZXI6OmRpZEZpbmlzaCgpCiAKIHZvaWQgRmls ZVJlYWRlcjo6ZGlkRmFpbChFeGNlcHRpb25Db2RlIGVjKQogewotICAgIG1fc3RhdGUgPSBEb25l OworICAgIG1fc3RhdGUgPSBDb21wbGV0ZWQ7CiAgICAgbV9lcnJvciA9IEZpbGVFcnJvcjo6Y3Jl YXRlKGVjKTsKIAogICAgIG1fc3RyZWFtUHJveHktPmNsb3NlKCk7CkBAIC0yMjMsNiArMjIzLDIy IEBAIHZvaWQgRmlsZVJlYWRlcjo6ZmlyZUV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSkK ICAgICBkaXNwYXRjaEV2ZW50KFByb2dyZXNzRXZlbnQ6OmNyZWF0ZSh0eXBlLCB0cnVlLCBzdGF0 aWNfY2FzdDx1bnNpZ25lZD4obV9ieXRlc0xvYWRlZCksIHN0YXRpY19jYXN0PHVuc2lnbmVkPiht X3RvdGFsQnl0ZXMpKSk7CiB9CiAKK0ZpbGVSZWFkZXI6OlJlYWR5U3RhdGUgRmlsZVJlYWRlcjo6 cmVhZHlTdGF0ZSgpIGNvbnN0Cit7CisgICAgc3dpdGNoIChtX3N0YXRlKSB7CisgICAgY2FzZSBO b25lOgorICAgIGNhc2UgU3RhcnRpbmc6CisgICAgICAgIHJldHVybiBFbXB0eTsKKyAgICBjYXNl IE9wZW5pbmc6CisgICAgY2FzZSBSZWFkaW5nOgorICAgICAgICByZXR1cm4gTG9hZGluZzsKKyAg ICBjYXNlIENvbXBsZXRlZDoKKyAgICAgICAgcmV0dXJuIERvbmU7CisgICAgfQorICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBFbXB0eTsKK30KKwogY29uc3QgU2NyaXB0U3Ry aW5nJiBGaWxlUmVhZGVyOjpyZXN1bHQoKQogewogICAgIC8vIElmIHJlYWRpbmcgYXMgYmluYXJ5 IHN0cmluZywgd2UgY2FuIHJldHVybiB0aGUgcmVzdWx0IGltbWVkaWF0ZWx5LgpAQCAtMjM3LDcg KzI1Myw3IEBAIGNvbnN0IFNjcmlwdFN0cmluZyYgRmlsZVJlYWRlcjo6cmVzdWx0KCkKICAgICBp ZiAobV9yZWFkVHlwZSA9PSBSZWFkRmlsZUFzVGV4dCkKICAgICAgICAgY29udmVydFRvVGV4dCgp OwogICAgIC8vIEZvciBkYXRhIFVSTCwgd2Ugb25seSBkbyB0aGUgY292ZXJzaW9uIHVudGlsIHdl IHJlY2VpdmUgYWxsIHRoZSByYXcgZGF0YS4KLSAgICBlbHNlIGlmIChtX3JlYWRUeXBlID09IFJl YWRGaWxlQXNEYXRhVVJMICYmIG1fc3RhdGUgPT0gRG9uZSkKKyAgICBlbHNlIGlmIChtX3JlYWRU eXBlID09IFJlYWRGaWxlQXNEYXRhVVJMICYmIG1fc3RhdGUgPT0gQ29tcGxldGVkKQogICAgICAg ICBjb252ZXJ0VG9EYXRhVVJMKCk7CiAKICAgICByZXR1cm4gbV9yZXN1bHQ7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2h0bWwvRmlsZVJlYWRlci5oIGIvV2ViQ29yZS9odG1sL0ZpbGVSZWFkZXIuaApp bmRleCBiMzBmYWQ3Li42ZmEzNjk5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvRmlsZVJlYWRl ci5oCisrKyBiL1dlYkNvcmUvaHRtbC9GaWxlUmVhZGVyLmgKQEAgLTcyLDcgKzcyLDcgQEAgcHVi bGljOgogICAgIHZvaWQgcmVhZEFzRGF0YVVSTChGaWxlKik7CiAgICAgdm9pZCBhYm9ydCgpOwog Ci0gICAgUmVhZHlTdGF0ZSByZWFkeVN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9zdGF0ZTsgfQor ICAgIFJlYWR5U3RhdGUgcmVhZHlTdGF0ZSgpIGNvbnN0OwogICAgIFBhc3NSZWZQdHI8RmlsZUVy cm9yPiBlcnJvcigpIHsgcmV0dXJuIG1fZXJyb3I7IH0KICAgICBjb25zdCBTY3JpcHRTdHJpbmcm IHJlc3VsdCgpOwogCkBAIC0xMDgsNiArMTA4LDEzIEBAIHByaXZhdGU6CiAgICAgICAgIFJlYWRG aWxlQXNUZXh0LAogICAgICAgICBSZWFkRmlsZUFzRGF0YVVSTAogICAgIH07CisgICAgZW51bSBJ bnRlcm5hbFN0YXRlIHsKKyAgICAgICAgTm9uZSwKKyAgICAgICAgU3RhcnRpbmcsCisgICAgICAg IE9wZW5pbmcsCisgICAgICAgIFJlYWRpbmcsCisgICAgICAgIENvbXBsZXRlZAorICAgIH07CiAK ICAgICBGaWxlUmVhZGVyKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqKTsKIApAQCAtMTIzLDcgKzEz MCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjb252ZXJ0VG9UZXh0KCk7CiAgICAgdm9pZCBjb252 ZXJ0VG9EYXRhVVJMKCk7CiAKLSAgICBSZWFkeVN0YXRlIG1fc3RhdGU7CisgICAgSW50ZXJuYWxT dGF0ZSBtX3N0YXRlOwogICAgIEV2ZW50VGFyZ2V0RGF0YSBtX2V2ZW50VGFyZ2V0RGF0YTsKIAog ICAgIFJlZlB0cjxCbG9iPiBtX2ZpbGVCbG9iOwpAQCAtMTUzLDcgKzE2MCw2IEBAIHByaXZhdGU6 CiAgICAgbG9uZyBsb25nIG1fYnl0ZXNMb2FkZWQ7CiAgICAgbG9uZyBsb25nIG1fdG90YWxCeXRl czsKICAgICBkb3VibGUgbV9sYXN0UHJvZ3Jlc3NOb3RpZmljYXRpb25UaW1lTVM7Ci0gICAgYm9v bCBtX2FscmVhZHlTdGFydGVkOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=