46180 2010-09-21 05:51:24 -0700 Use WTF::Vector for storing formData in ResourceHandleWin 2010-09-21 07:36:11 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 43712 1 paroga paroga aroben commit-queue oldest_to_newest 282239 0 paroga 2010-09-21 05:51:24 -0700 see patch 282240 1 68225 paroga 2010-09-21 05:52:35 -0700 Created attachment 68225 Patch 282242 2 68227 paroga 2010-09-21 05:55:40 -0700 Created attachment 68227 Patch 282271 3 68227 aroben 2010-09-21 06:45:58 -0700 Comment on attachment 68227 Patch It would be great to have a more detailed explanation in your ChangeLogs. It makes reviewers' lives easier, and also will make your life easier if you have to go back and look at this change in the future. 282303 4 68227 commit-queue 2010-09-21 07:36:06 -0700 Comment on attachment 68227 Patch Clearing flags on attachment: 68227 Committed r67953: <http://trac.webkit.org/changeset/67953> 282304 5 commit-queue 2010-09-21 07:36:11 -0700 All reviewed patches have been landed. Closing bug. 68225 2010-09-21 05:52:35 -0700 2010-09-21 05:55:40 -0700 Patch bug-46180.patch text/plain 4569 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDY3OTQ0KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNiBAQAorMjAxMC0wOS0yMSAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FA d2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVc2UgV1RGOjpWZWN0b3IgZm9yIHN0b3JpbmcgZm9ybURhdGEgaW4gUmVzb3VyY2VIYW5k bGVXaW4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 NjE4MAorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFs Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZUludGVybmFsOjpSZXNvdXJjZUhh bmRsZUludGVybmFsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJjZUhh bmRsZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6b25IYW5kbGVD cmVhdGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpvblJlcXVlc3RDb21w bGV0ZSk6CisKIDIwMTAtMDktMjEgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaA0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0t IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgJKHJldmlz aW9uIDY3OTQzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50 ZXJuYWwuaAkod29ya2luZyBjb3B5KQpAQCAtOTYsOSArOTYsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgICAgICAsIG1fc2Vjb25kYXJ5SGFuZGxlKDApCiAgICAgICAgICAgICAsIG1f am9iSWQoMCkKICAgICAgICAgICAgICwgbV90aHJlYWRJZCgwKQotICAgICAgICAgICAgLCBtX3dy aXRpbmcoZmFsc2UpCi0gICAgICAgICAgICAsIG1fZm9ybURhdGFTdHJpbmcoMCkKLSAgICAgICAg ICAgICwgbV9mb3JtRGF0YUxlbmd0aCgwKQorICAgICAgICAgICAgLCBtX3NlbnRFbmRSZXF1ZXN0 KGZhbHNlKQogICAgICAgICAgICAgLCBtX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSgwKQogICAgICAg ICAgICAgLCBtX2hhc1JlY2VpdmVkUmVzcG9uc2UoZmFsc2UpCiAgICAgICAgICAgICAsIG1fcmVz ZW5kKGZhbHNlKQpAQCAtMTcxLDkgKzE2OSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgSElOVEVSTkVUIG1fc2Vjb25kYXJ5SGFuZGxlOwogICAgICAgICB1bnNpZ25lZCBtX2pvYklk OwogICAgICAgICBEV09SRCBtX3RocmVhZElkOwotICAgICAgICBib29sIG1fd3JpdGluZzsKLSAg ICAgICAgY2hhciogbV9mb3JtRGF0YVN0cmluZzsKLSAgICAgICAgaW50IG1fZm9ybURhdGFMZW5n dGg7CisgICAgICAgIGJvb2wgbV9zZW50RW5kUmVxdWVzdDsKKyAgICAgICAgVmVjdG9yPGNoYXI+ IG1fZm9ybURhdGE7CiAgICAgICAgIGludCBtX2J5dGVzUmVtYWluaW5nVG9Xcml0ZTsKICAgICAg ICAgU3RyaW5nIG1fcG9zdFJlZmVycmVyOwogICAgICAgICBib29sIG1faGFzUmVjZWl2ZWRSZXNw b25zZTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vUmVzb3VyY2VIYW5kbGVX aW4uY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNv dXJjZUhhbmRsZVdpbi5jcHAJKHJldmlzaW9uIDY3OTQzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzNSwx OSArMjM1LDE3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6Om9uSGFuZGxlQ3JlYXRlZChMUEEKICAg ICAgICAgaGVhZGVycyArPSBkLT5tX3Bvc3RSZWZlcnJlcjsKICAgICAgICAgaGVhZGVycyArPSAi XG4iOwogICAgICAgICBjb25zdCBDU3RyaW5nJiBoZWFkZXJzTGF0aW4xID0gaGVhZGVycy5sYXRp bjEoKTsKLSAgICAgICAgU3RyaW5nIGZvcm1EYXRhID0gcmVxdWVzdCgpLmh0dHBCb2R5KCktPmZs YXR0ZW5Ub1N0cmluZygpOworICAgICAgICBpZiAoZmlyc3RSZXF1ZXN0KCkuaHR0cEJvZHkoKSkg eworICAgICAgICAgICAgZmlyc3RSZXF1ZXN0KCkuaHR0cEJvZHkoKS0+ZmxhdHRlbihkLT5tX2Zv cm1EYXRhKTsKKyAgICAgICAgICAgIGQtPm1fYnl0ZXNSZW1haW5pbmdUb1dyaXRlID0gZC0+bV9m b3JtRGF0YS5zaXplKCk7CisgICAgICAgIH0KICAgICAgICAgSU5URVJORVRfQlVGRkVSU0EgYnVm ZmVyczsKICAgICAgICAgbWVtc2V0KCZidWZmZXJzLCAwLCBzaXplb2YoYnVmZmVycykpOwogICAg ICAgICBidWZmZXJzLmR3U3RydWN0U2l6ZSA9IHNpemVvZihJTlRFUk5FVF9CVUZGRVJTQSk7CiAg ICAgICAgIGJ1ZmZlcnMubHBjc3pIZWFkZXIgPSBoZWFkZXJzTGF0aW4xLmRhdGEoKTsKICAgICAg ICAgYnVmZmVycy5kd0hlYWRlcnNMZW5ndGggPSBoZWFkZXJzLmxlbmd0aCgpOwotICAgICAgICBi dWZmZXJzLmR3QnVmZmVyVG90YWwgPSBmb3JtRGF0YS5sZW5ndGgoKTsKKyAgICAgICAgYnVmZmVy cy5kd0J1ZmZlclRvdGFsID0gZC0+bV9ieXRlc1JlbWFpbmluZ1RvV3JpdGU7CiAgICAgICAgIAot ICAgICAgICBkLT5tX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSA9IGZvcm1EYXRhLmxlbmd0aCgpOwot ICAgICAgICBkLT5tX2Zvcm1EYXRhU3RyaW5nID0gKGNoYXIqKW1hbGxvYyhmb3JtRGF0YS5sZW5n dGgoKSk7Ci0gICAgICAgIGQtPm1fZm9ybURhdGFMZW5ndGggPSBmb3JtRGF0YS5sZW5ndGgoKTsK LSAgICAgICAgc3RybmNweShkLT5tX2Zvcm1EYXRhU3RyaW5nLCBmb3JtRGF0YS5sYXRpbjEoKS5k YXRhKCksIGZvcm1EYXRhLmxlbmd0aCgpKTsKLSAgICAgICAgZC0+bV93cml0aW5nID0gdHJ1ZTsK ICAgICAgICAgSHR0cFNlbmRSZXF1ZXN0RXhBKGQtPm1fc2Vjb25kYXJ5SGFuZGxlLCAmYnVmZmVy cywgMCwgMCwgKERXT1JEX1BUUilkLT5tX2pvYklkKTsKICAgICAgICAgLy8gRklYTUU6IGFkZCBw cm9wZXIgZXJyb3IgaGFuZGxpbmcKICAgICB9CkBAIC0yNjYsMjAgKzI2NCwyMSBAQCB2b2lkIFJl c291cmNlSGFuZGxlOjpvblJlcXVlc3RSZWRpcmVjdGVkCiAKIHZvaWQgUmVzb3VyY2VIYW5kbGU6 Om9uUmVxdWVzdENvbXBsZXRlKExQQVJBTSBsUGFyYW0pCiB7Ci0gICAgaWYgKGQtPm1fd3JpdGlu ZykgeworICAgIGlmIChkLT5tX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSkgewogICAgICAgICBEV09S RCBieXRlc1dyaXR0ZW47Ci0gICAgICAgIEludGVybmV0V3JpdGVGaWxlKGQtPm1fc2Vjb25kYXJ5 SGFuZGxlLAotICAgICAgICAgICAgICAgICAgICAgICAgICBkLT5tX2Zvcm1EYXRhU3RyaW5nICsg KGQtPm1fZm9ybURhdGFMZW5ndGggLSBkLT5tX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSksCisgICAg ICAgIEludGVybmV0V3JpdGVGaWxlKGQtPm1fcmVxdWVzdEhhbmRsZSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgZC0+bV9mb3JtRGF0YS5kYXRhKCkgKyAoZC0+bV9mb3JtRGF0YS5zaXplKCkg LSBkLT5tX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSksCiAgICAgICAgICAgICAgICAgICAgICAgICAg IGQtPm1fYnl0ZXNSZW1haW5pbmdUb1dyaXRlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAm Ynl0ZXNXcml0dGVuKTsKICAgICAgICAgZC0+bV9ieXRlc1JlbWFpbmluZ1RvV3JpdGUgLT0gYnl0 ZXNXcml0dGVuOwotICAgICAgICBpZiAoIWQtPm1fYnl0ZXNSZW1haW5pbmdUb1dyaXRlKSB7Ci0g ICAgICAgICAgICAvLyBFbmQgdGhlIHJlcXVlc3QuCi0gICAgICAgICAgICBkLT5tX3dyaXRpbmcg PSBmYWxzZTsKLSAgICAgICAgICAgIEh0dHBFbmRSZXF1ZXN0KGQtPm1fc2Vjb25kYXJ5SGFuZGxl LCAwLCAwLCAoRFdPUkRfUFRSKWQtPm1fam9iSWQpOwotICAgICAgICAgICAgZnJlZShkLT5tX2Zv cm1EYXRhU3RyaW5nKTsKLSAgICAgICAgICAgIGQtPm1fZm9ybURhdGFTdHJpbmcgPSAwOwotICAg ICAgICB9CisgICAgICAgIGlmICghZC0+bV9ieXRlc1JlbWFpbmluZ1RvV3JpdGUpCisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIGQtPm1fZm9ybURhdGEuY2xlYXIoKTsKKyAgICB9CisKKyAg ICBpZiAoIWQtPm1fc2VudEVuZFJlcXVlc3QpIHsKKyAgICAgICAgSHR0cEVuZFJlcXVlc3RXKGQt Pm1fcmVxdWVzdEhhbmRsZSwgMCwgMCwgcmVpbnRlcnByZXRfY2FzdDxEV09SRF9QVFI+KHRoaXMp KTsKKyAgICAgICAgZC0+bV9zZW50RW5kUmVxdWVzdCA9IHRydWU7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAK 68227 2010-09-21 05:55:40 -0700 2010-09-21 07:36:05 -0700 Patch bug-46180.patch text/plain 4568 paroga SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDY3OTQ0KQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNiBAQAorMjAxMC0wOS0yMSAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FA d2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBVc2UgV1RGOjpWZWN0b3IgZm9yIHN0b3JpbmcgZm9ybURhdGEgaW4gUmVzb3VyY2VIYW5k bGVXaW4uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 NjE4MAorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFs Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZUludGVybmFsOjpSZXNvdXJjZUhh bmRsZUludGVybmFsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJjZUhh bmRsZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6b25IYW5kbGVD cmVhdGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlOjpvblJlcXVlc3RDb21w bGV0ZSk6CisKIDIwMTAtMDktMjEgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgpJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaA0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0t IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZUhhbmRsZUludGVybmFsLmgJKHJldmlz aW9uIDY3OTQzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlSGFuZGxlSW50 ZXJuYWwuaAkod29ya2luZyBjb3B5KQpAQCAtOTYsOSArOTYsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgICAgICAsIG1fc2Vjb25kYXJ5SGFuZGxlKDApCiAgICAgICAgICAgICAsIG1f am9iSWQoMCkKICAgICAgICAgICAgICwgbV90aHJlYWRJZCgwKQotICAgICAgICAgICAgLCBtX3dy aXRpbmcoZmFsc2UpCi0gICAgICAgICAgICAsIG1fZm9ybURhdGFTdHJpbmcoMCkKLSAgICAgICAg ICAgICwgbV9mb3JtRGF0YUxlbmd0aCgwKQorICAgICAgICAgICAgLCBtX3NlbnRFbmRSZXF1ZXN0 KGZhbHNlKQogICAgICAgICAgICAgLCBtX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSgwKQogICAgICAg ICAgICAgLCBtX2hhc1JlY2VpdmVkUmVzcG9uc2UoZmFsc2UpCiAgICAgICAgICAgICAsIG1fcmVz ZW5kKGZhbHNlKQpAQCAtMTcxLDkgKzE2OSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgSElOVEVSTkVUIG1fc2Vjb25kYXJ5SGFuZGxlOwogICAgICAgICB1bnNpZ25lZCBtX2pvYklk OwogICAgICAgICBEV09SRCBtX3RocmVhZElkOwotICAgICAgICBib29sIG1fd3JpdGluZzsKLSAg ICAgICAgY2hhciogbV9mb3JtRGF0YVN0cmluZzsKLSAgICAgICAgaW50IG1fZm9ybURhdGFMZW5n dGg7CisgICAgICAgIGJvb2wgbV9zZW50RW5kUmVxdWVzdDsKKyAgICAgICAgVmVjdG9yPGNoYXI+ IG1fZm9ybURhdGE7CiAgICAgICAgIGludCBtX2J5dGVzUmVtYWluaW5nVG9Xcml0ZTsKICAgICAg ICAgU3RyaW5nIG1fcG9zdFJlZmVycmVyOwogICAgICAgICBib29sIG1faGFzUmVjZWl2ZWRSZXNw b25zZTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vUmVzb3VyY2VIYW5kbGVX aW4uY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNv dXJjZUhhbmRsZVdpbi5jcHAJKHJldmlzaW9uIDY3OTQzKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzNSwx OSArMjM1LDE3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6Om9uSGFuZGxlQ3JlYXRlZChMUEEKICAg ICAgICAgaGVhZGVycyArPSBkLT5tX3Bvc3RSZWZlcnJlcjsKICAgICAgICAgaGVhZGVycyArPSAi XG4iOwogICAgICAgICBjb25zdCBDU3RyaW5nJiBoZWFkZXJzTGF0aW4xID0gaGVhZGVycy5sYXRp bjEoKTsKLSAgICAgICAgU3RyaW5nIGZvcm1EYXRhID0gcmVxdWVzdCgpLmh0dHBCb2R5KCktPmZs YXR0ZW5Ub1N0cmluZygpOworICAgICAgICBpZiAoZmlyc3RSZXF1ZXN0KCkuaHR0cEJvZHkoKSkg eworICAgICAgICAgICAgZmlyc3RSZXF1ZXN0KCkuaHR0cEJvZHkoKS0+ZmxhdHRlbihkLT5tX2Zv cm1EYXRhKTsKKyAgICAgICAgICAgIGQtPm1fYnl0ZXNSZW1haW5pbmdUb1dyaXRlID0gZC0+bV9m b3JtRGF0YS5zaXplKCk7CisgICAgICAgIH0KICAgICAgICAgSU5URVJORVRfQlVGRkVSU0EgYnVm ZmVyczsKICAgICAgICAgbWVtc2V0KCZidWZmZXJzLCAwLCBzaXplb2YoYnVmZmVycykpOwogICAg ICAgICBidWZmZXJzLmR3U3RydWN0U2l6ZSA9IHNpemVvZihJTlRFUk5FVF9CVUZGRVJTQSk7CiAg ICAgICAgIGJ1ZmZlcnMubHBjc3pIZWFkZXIgPSBoZWFkZXJzTGF0aW4xLmRhdGEoKTsKICAgICAg ICAgYnVmZmVycy5kd0hlYWRlcnNMZW5ndGggPSBoZWFkZXJzLmxlbmd0aCgpOwotICAgICAgICBi dWZmZXJzLmR3QnVmZmVyVG90YWwgPSBmb3JtRGF0YS5sZW5ndGgoKTsKKyAgICAgICAgYnVmZmVy cy5kd0J1ZmZlclRvdGFsID0gZC0+bV9ieXRlc1JlbWFpbmluZ1RvV3JpdGU7CiAgICAgICAgIAot ICAgICAgICBkLT5tX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSA9IGZvcm1EYXRhLmxlbmd0aCgpOwot ICAgICAgICBkLT5tX2Zvcm1EYXRhU3RyaW5nID0gKGNoYXIqKW1hbGxvYyhmb3JtRGF0YS5sZW5n dGgoKSk7Ci0gICAgICAgIGQtPm1fZm9ybURhdGFMZW5ndGggPSBmb3JtRGF0YS5sZW5ndGgoKTsK LSAgICAgICAgc3RybmNweShkLT5tX2Zvcm1EYXRhU3RyaW5nLCBmb3JtRGF0YS5sYXRpbjEoKS5k YXRhKCksIGZvcm1EYXRhLmxlbmd0aCgpKTsKLSAgICAgICAgZC0+bV93cml0aW5nID0gdHJ1ZTsK ICAgICAgICAgSHR0cFNlbmRSZXF1ZXN0RXhBKGQtPm1fc2Vjb25kYXJ5SGFuZGxlLCAmYnVmZmVy cywgMCwgMCwgKERXT1JEX1BUUilkLT5tX2pvYklkKTsKICAgICAgICAgLy8gRklYTUU6IGFkZCBw cm9wZXIgZXJyb3IgaGFuZGxpbmcKICAgICB9CkBAIC0yNjYsMjAgKzI2NCwyMSBAQCB2b2lkIFJl c291cmNlSGFuZGxlOjpvblJlcXVlc3RSZWRpcmVjdGVkCiAKIHZvaWQgUmVzb3VyY2VIYW5kbGU6 Om9uUmVxdWVzdENvbXBsZXRlKExQQVJBTSBsUGFyYW0pCiB7Ci0gICAgaWYgKGQtPm1fd3JpdGlu ZykgeworICAgIGlmIChkLT5tX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSkgewogICAgICAgICBEV09S RCBieXRlc1dyaXR0ZW47Ci0gICAgICAgIEludGVybmV0V3JpdGVGaWxlKGQtPm1fc2Vjb25kYXJ5 SGFuZGxlLAotICAgICAgICAgICAgICAgICAgICAgICAgICBkLT5tX2Zvcm1EYXRhU3RyaW5nICsg KGQtPm1fZm9ybURhdGFMZW5ndGggLSBkLT5tX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSksCisgICAg ICAgIEludGVybmV0V3JpdGVGaWxlKGQtPm1fcmVxdWVzdEhhbmRsZSwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgZC0+bV9mb3JtRGF0YS5kYXRhKCkgKyAoZC0+bV9mb3JtRGF0YS5zaXplKCkg LSBkLT5tX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSksCiAgICAgICAgICAgICAgICAgICAgICAgICAg IGQtPm1fYnl0ZXNSZW1haW5pbmdUb1dyaXRlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAm Ynl0ZXNXcml0dGVuKTsKICAgICAgICAgZC0+bV9ieXRlc1JlbWFpbmluZ1RvV3JpdGUgLT0gYnl0 ZXNXcml0dGVuOwotICAgICAgICBpZiAoIWQtPm1fYnl0ZXNSZW1haW5pbmdUb1dyaXRlKSB7Ci0g ICAgICAgICAgICAvLyBFbmQgdGhlIHJlcXVlc3QuCi0gICAgICAgICAgICBkLT5tX3dyaXRpbmcg PSBmYWxzZTsKLSAgICAgICAgICAgIEh0dHBFbmRSZXF1ZXN0KGQtPm1fc2Vjb25kYXJ5SGFuZGxl LCAwLCAwLCAoRFdPUkRfUFRSKWQtPm1fam9iSWQpOwotICAgICAgICAgICAgZnJlZShkLT5tX2Zv cm1EYXRhU3RyaW5nKTsKLSAgICAgICAgICAgIGQtPm1fZm9ybURhdGFTdHJpbmcgPSAwOwotICAg ICAgICB9CisgICAgICAgIGlmIChkLT5tX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSkKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgZC0+bV9mb3JtRGF0YS5jbGVhcigpOworICAgIH0KKworICAg IGlmICghZC0+bV9zZW50RW5kUmVxdWVzdCkgeworICAgICAgICBIdHRwRW5kUmVxdWVzdFcoZC0+ bV9yZXF1ZXN0SGFuZGxlLCAwLCAwLCByZWludGVycHJldF9jYXN0PERXT1JEX1BUUj4odGhpcykp OworICAgICAgICBkLT5tX3NlbnRFbmRSZXF1ZXN0ID0gdHJ1ZTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAo=