42418 2010-07-15 15:56:16 -0700 Handle failed loads correctly 2010-07-28 16:35:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 252191 0 andersca 2010-07-15 15:56:16 -0700 Handle failed loads correctly 252196 1 61740 andersca 2010-07-15 16:03:43 -0700 Created attachment 61740 Patch 257441 2 andersca 2010-07-28 16:35:50 -0700 Committed r63484: <http://trac.webkit.org/changeset/63484> 61740 2010-07-15 16:03:43 -0700 2010-07-15 16:05:02 -0700 Patch bug-42418-20100715160342.patch text/plain 12127 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg Y2M3NmFmYTRiNzk5M2Y1Y2M5ZmJmYmQ2MjE2MDZlMjkwZWQxYjdlZS4uODY2OTQ5ZjgzODRjMzcw MDllYzMyYmY5ZjZiYmNjYzY2NTNhYWFkNCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw1NyBAQAogMjAxMC0wNy0xNSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhbmRsZSBmYWlsZWQgbG9hZHMgY29ycmVjdGx5 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjQxOAor CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL0R1bW15UGx1Z2luLmNwcDoKKyAgICAgICAg KFdlYktpdDo6RHVtbXlQbHVnaW46OnN0cmVhbURpZEZhaWwpOgorICAgICAgICAqIFdlYlByb2Nl c3MvUGx1Z2lucy9EdW1teVBsdWdpbi5oOgorICAgICAgICBBZGQgZW1wdHkgc3R1Yi4KKworICAg ICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHA6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpzdHJlYW1EaWRGYWlsKToKKyAgICAgICAg Q2FsbCBOZXRzY2FwZVBsdWdpblN0cmVhbTo6ZGlkRmFpbC4KKyAgICAKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uY3BwOgorICAgICAg ICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpblN0cmVhbTo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAg ICAgICAgVGFrZSBhIHJlZmVyZW5jZSB0byB0aGUgcGx1Zy1pbiBzdHJlYW0gaW4gY2FzZSBzdGFy dGluZyBpdCBjYXVzZXMgaXQgdG8gYmUgZGVzdHJveWVkLgorICAgICAgICAKKyAgICAgICAgKFdl YktpdDo6TmV0c2NhcGVQbHVnaW5TdHJlYW06OmRpZEZhaWwpOgorICAgICAgICBUYWtlIGEgcmVm ZXJlbmNlIHRvIHRoZSBwbHVnLWluIHN0cmVhbSBpbiBjYXNlIHN0b3BwaW5nIGl0IGNhdXNlcyBp dCB0byBiZSBkZXN0cm95ZWQuCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5TdHJl YW06OmRlc3Ryb3kpOgorICAgICAgICBDYW5jZWwgdGhlIHN0cmVhbS4KKworICAgICAgICAoV2Vi S2l0OjpOZXRzY2FwZVBsdWdpblN0cmVhbTo6c3RhcnQpOgorICAgICAgICBJZiB3ZSBmYWlsIHRv IHN0YXJ0IHRoZSBzdHJlYW0sIGNhbmNlbCB0aGUgbG9hZC4KKworICAgICAgICAoV2ViS2l0OjpO ZXRzY2FwZVBsdWdpblN0cmVhbTo6Y2FuY2VsKToKKyAgICAgICAgQ2FsbCBOZXRzY2FwZVBsdWdp bjo6Y2FuY2VsU3RyZWFtTG9hZC4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpblN0 cmVhbTo6bm90aWZ5QW5kRGVzdHJveVN0cmVhbSk6CisgICAgICAgIERvbid0IGNhbGwgY2FuY2Vs IGhlcmUuIG5vdGlmeUFuZERlc3Ryb3lTdHJlYW0gY2FuIGJlIGNhbGxlZCB3aGVuIHdlIGRvbid0 IHdhbnQgdG8gY2FuY2VsIHRoZQorICAgICAgICBsb2FkLCBzdWNoIGFzIHdoZW4gaXQncyBhbHJl YWR5IGZhaWxlZCB0byBsb2FkLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmg6CisgICAgICAgIEFkZCBkaWRGYWlsLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oOgorICAgICAgICBBZGQgcHVyZSB2aXJ0 dWFsIHN0cmVhbURpZEZhaWwgbWVtYmVyIGZ1bmN0aW9uLgorCisgICAgICAgICogV2ViUHJvY2Vz cy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3OjpT dHJlYW06OlN0cmVhbSk6CisgICAgICAgIEluaXRpYWxpemUgbV9zdHJlYW1XYXNDYW5jZWxsZWQg dG8gZmFsc2UuCisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6U3RyZWFtOjpjYW5jZWwp OgorICAgICAgICBTZXQgbV9zdHJlYW1XYXNDYW5jZWxsZWQgdG8gdHJ1ZS4KKworICAgICAgICAo V2ViS2l0OjpQbHVnaW5WaWV3OjpTdHJlYW06OmRpZEZhaWwpOgorICAgICAgICBDYWxsIFBsdWdp bjo6c3RyZWFtRGlkRmFpbC4KKworMjAxMC0wNy0xNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJz Y2FAYXBwbGUuY29tPgorCiAgICAgICAgIEF0dGVtcHQgdG8gZml4IHRoZSBXaW5kb3dzIGJ1aWxk LgogCiAgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwOgpkaWZmIC0t Z2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvRHVtbXlQbHVnaW4uY3BwIGIvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvRHVtbXlQbHVnaW4uY3BwCmluZGV4IDUzOTJlMWFjMGRiOGI5 ZjZiNzE3ODA1MjQ1YjM1NTk5MDFkYjE2M2UuLmM5N2Y2YmFkYzZkMmY3YTY4YTc3NTgyZTFmMzVi ZmU4MjViNjFjMTcgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0R1bW15 UGx1Z2luLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9EdW1teVBsdWdpbi5j cHAKQEAgLTgzLDQgKzgzLDggQEAgdm9pZCBEdW1teVBsdWdpbjo6c3RyZWFtRGlkUmVjZWl2ZVJl c3BvbnNlKHVpbnQ2NF90IHN0cmVhbUlELCBjb25zdCBXZWJDb3JlOjpLVVIKIHsKIH0KIAordm9p ZCBEdW1teVBsdWdpbjo6c3RyZWFtRGlkRmFpbCh1aW50NjRfdCBzdHJlYW1JRCwgYm9vbCB3YXND YW5jZWxsZWQpCit7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvRHVtbXlQbHVnaW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vz cy9QbHVnaW5zL0R1bW15UGx1Z2luLmgKaW5kZXggZWNkMDI3YTg5Mjc1OGU2YTVkMDNiMWJjMGI5 YzAzMzI3MThiYzIwZC4uMjA0MGExMmU1YjY0NTRiYWQ1N2E4NDUyN2M3NzFiZTVkY2MyNjFjMiAx MDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvRHVtbXlQbHVnaW4uaAorKysg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9EdW1teVBsdWdpbi5oCkBAIC01MSw2ICs1MSw4 IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZEV2YWx1YXRlSmF2YVNjcmlwdCh1aW50 NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgcmVxdWVzdFVSTFN0cmluZywg Y29uc3QgV2ViQ29yZTo6U3RyaW5nJiByZXN1bHQpOwogICAgIHZpcnR1YWwgdm9pZCBzdHJlYW1E aWRSZWNlaXZlUmVzcG9uc2UodWludDY0X3Qgc3RyZWFtSUQsIGNvbnN0IFdlYkNvcmU6OktVUkwm IHJlc3BvbnNlVVJMLCB1aW50MzJfdCBzdHJlYW1MZW5ndGgsIAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgY29uc3Qg V2ViQ29yZTo6U3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBoZWFkZXJz KTsKKyAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtRGlkRmFpbCh1aW50NjRfdCBzdHJlYW1JRCwgYm9v bCB3YXNDYW5jZWxsZWQpOworCiAgICAgdmlydHVhbCBQbHVnaW5Db250cm9sbGVyKiBjb250cm9s bGVyKCk7CiB9OwogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRz Y2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRz Y2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKaW5kZXggNmViYzY3ZTE1YzIwOGVlMTYzYmVjODk5MjNl NGQ2OTAzODkxNWE3NS4uOTkzMDZiNWU5OGYwZjNmOTU2OGM5ZmFkYzVkNWY4YmM5MGI1Zjg2NyAx MDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQ bHVnaW4uY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNj YXBlUGx1Z2luLmNwcApAQCAtMzM3LDYgKzMzNywxMiBAQCB2b2lkIE5ldHNjYXBlUGx1Z2luOjpz dHJlYW1EaWRSZWNlaXZlUmVzcG9uc2UodWludDY0X3Qgc3RyZWFtSUQsIGNvbnN0IEtVUkwmIHJl cwogICAgICAgICBwbHVnaW5TdHJlYW0tPmRpZFJlY2VpdmVSZXNwb25zZShyZXNwb25zZVVSTCwg c3RyZWFtTGVuZ3RoLCBsYXN0TW9kaWZpZWRUaW1lLCBtaW1lVHlwZSwgaGVhZGVycyk7CiB9CiAK K3ZvaWQgTmV0c2NhcGVQbHVnaW46OnN0cmVhbURpZEZhaWwodWludDY0X3Qgc3RyZWFtSUQsIGJv b2wgd2FzQ2FuY2VsbGVkKQoreworICAgIGlmIChOZXRzY2FwZVBsdWdpblN0cmVhbSogcGx1Z2lu U3RyZWFtID0gc3RyZWFtRnJvbUlEKHN0cmVhbUlEKSkKKyAgICAgICAgcGx1Z2luU3RyZWFtLT5k aWRGYWlsKHdhc0NhbmNlbGxlZCk7Cit9CisKIFBsdWdpbkNvbnRyb2xsZXIqIE5ldHNjYXBlUGx1 Z2luOjpjb250cm9sbGVyKCkKIHsKICAgICByZXR1cm4gbV9wbHVnaW5Db250cm9sbGVyOwpkaWZm IC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVn aW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2lu LmgKaW5kZXggMTNkZjU2MTAwODllN2E3MWM0ZTRhMGUzZjJhYTRjNTI4NWM2ZmExMy4uMmYxNzU2 NjgxNGMwMDM2YjhiOTZhODZkYTgwMGUzMmQ4MjQ4NzkwNCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaAorKysgYi9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oCkBAIC04OSw2ICs4 OSw3IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2b2lkIGRpZEV2YWx1YXRlSmF2YVNjcmlwdCh1 aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgcmVxdWVzdFVSTFN0cmlu ZywgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiByZXN1bHQpOwogICAgIHZpcnR1YWwgdm9pZCBzdHJl YW1EaWRSZWNlaXZlUmVzcG9uc2UodWludDY0X3Qgc3RyZWFtSUQsIGNvbnN0IFdlYkNvcmU6OktV UkwmIHJlc3BvbnNlVVJMLCB1aW50MzJfdCBzdHJlYW1MZW5ndGgsIAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgY29u c3QgV2ViQ29yZTo6U3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBoZWFk ZXJzKTsKKyAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtRGlkRmFpbCh1aW50NjRfdCBzdHJlYW1JRCwg Ym9vbCB3YXNDYW5jZWxsZWQpOwogCiAgICAgdmlydHVhbCBQbHVnaW5Db250cm9sbGVyKiBjb250 cm9sbGVyKCk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmNwcAppbmRleCBkODA5MTUzZDIxNDBiZTEz MmQ1MTdlYzIzMzZkMTIwN2E0NDQ0MzZkLi5hMWFjNzVhNDVlNWE1ZDc0ZGQxNzZiY2ExNWYxYjEx NzgzZTI2ZTRhIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2Fw ZS9OZXRzY2FwZVBsdWdpblN0cmVhbS5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uY3BwCkBAIC01OCw5ICs1OCwyMCBAQCBO ZXRzY2FwZVBsdWdpblN0cmVhbTo6fk5ldHNjYXBlUGx1Z2luU3RyZWFtKCkKIAogdm9pZCBOZXRz Y2FwZVBsdWdpblN0cmVhbTo6ZGlkUmVjZWl2ZVJlc3BvbnNlKGNvbnN0IEtVUkwmIHJlc3BvbnNl VVJMLCB1aW50MzJfdCBzdHJlYW1MZW5ndGgsIHVpbnQzMl90IGxhc3RNb2RpZmllZFRpbWUsIGNv bnN0IFN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFN0cmluZyYgaGVhZGVycykKIHsKKyAgICAvLyBT dGFydGluZyB0aGUgc3RyZWFtIGNvdWxkIGNhdXNlIHRoZSBwbHVnLWluIHN0cmVhbSB0byBnbyBh d2F5IHNvIHdlIGtlZXAgYSByZWZlcmVuY2UgdG8gaXQgaGVyZS4KKyAgICBSZWZQdHI8TmV0c2Nh cGVQbHVnaW5TdHJlYW0+IHByb3RlY3QodGhpcyk7CisKICAgICBzdGFydChyZXNwb25zZVVSTCwg c3RyZWFtTGVuZ3RoLCBsYXN0TW9kaWZpZWRUaW1lLCBtaW1lVHlwZSwgaGVhZGVycyk7CiB9CiAK K3ZvaWQgTmV0c2NhcGVQbHVnaW5TdHJlYW06OmRpZEZhaWwoYm9vbCB3YXNDYW5jZWxsZWQpCit7 CisgICAgLy8gU3RvcHBpbmcgdGhlIHN0cmVhbSBjb3VsZCBjYXVzZSB0aGUgcGx1Zy1pbiBzdHJl YW0gdG8gZ28gYXdheSBzbyB3ZSBrZWVwIGEgcmVmZXJlbmNlIHRvIGl0IGhlcmUuCisgICAgUmVm UHRyPE5ldHNjYXBlUGx1Z2luU3RyZWFtPiBwcm90ZWN0KHRoaXMpOworCisgICAgc3RvcCh3YXND YW5jZWxsZWQgPyBOUFJFU19VU0VSX0JSRUFLIDogTlBSRVNfTkVUV09SS19FUlIpOworfQorICAg IAogdm9pZCBOZXRzY2FwZVBsdWdpblN0cmVhbTo6c2VuZEphdmFTY3JpcHRTdHJlYW0oY29uc3Qg U3RyaW5nJiByZXF1ZXN0VVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIHJlc3VsdCkKIHsKICAgICAv LyBzdGFydGluZyB0aGUgc3RyZWFtIG9yIGRlbGl2ZXJpbmcgdGhlIGRhdGEgdG8gaXQgbWlnaHQg Y2F1c2UgdGhlIHBsdWctaW4gc3RyZWFtIHRvIGdvIGF3YXksIHNvIHdlIGtlZXAKQEAgLTkyLDYg KzEwMyw3IEBAIE5QRXJyb3IgTmV0c2NhcGVQbHVnaW5TdHJlYW06OmRlc3Ryb3koTlBSZWFzb24g cmVhc29uKQogICAgIGlmIChyZWFzb24gPT0gTlBSRVNfRE9ORSkKICAgICAgICAgcmV0dXJuIE5Q RVJSX0lOVkFMSURfUEFSQU07CiAKKyAgICBjYW5jZWwoKTsKICAgICBzdG9wKHJlYXNvbik7CiAg ICAgcmV0dXJuIE5QRVJSX05PX0VSUk9SOwogfQpAQCAtMTI5LDcgKzE0MSw4IEBAIGJvb2wgTmV0 c2NhcGVQbHVnaW5TdHJlYW06OnN0YXJ0KGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgcmVzcG9uc2VV UkxTdHJpbmcsIHVpbnQzCiAKICAgICBOUEVycm9yIGVycm9yID0gbV9wbHVnaW4tPk5QUF9OZXdT dHJlYW0oY29uc3RfY2FzdDxjaGFyKj4obV9taW1lVHlwZS5kYXRhKCkpLCAmbV9ucFN0cmVhbSwg ZmFsc2UsICZtX3RyYW5zZmVyTW9kZSk7CiAgICAgaWYgKGVycm9yICE9IE5QRVJSX05PX0VSUk9S KSB7Ci0gICAgICAgIC8vIFdlIGZhaWxlZCB0byBzdGFydCB0aGUgc3RyZWFtLCBkZXN0cm95IGl0 LgorICAgICAgICAvLyBXZSBmYWlsZWQgdG8gc3RhcnQgdGhlIHN0cmVhbSwgY2FuY2VsIHRoZSBs b2FkIGFuZCBkZXN0cm95IGl0LgorICAgICAgICBjYW5jZWwoKTsKICAgICAgICAgbm90aWZ5QW5k RGVzdHJveVN0cmVhbShOUFJFU19ORVRXT1JLX0VSUik7CiAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICB9CkBAIC0xMzgsNyArMTUxLDggQEAgYm9vbCBOZXRzY2FwZVBsdWdpblN0cmVhbTo6c3Rh cnQoY29uc3QgV2ViQ29yZTo6U3RyaW5nJiByZXNwb25zZVVSTFN0cmluZywgdWludDMKICAgICBt X2lzU3RhcnRlZCA9IHRydWU7CiAKICAgICBpZiAoIWlzU3VwcG9ydGVkVHJhbnNmZXJNb2RlKG1f dHJhbnNmZXJNb2RlKSkgewotICAgICAgICAvLyBTdG9wIHRoZSBzdHJlYW0uCisgICAgICAgIC8v IENhbmNlbCB0aGUgbG9hZCBhbmQgc3RvcCB0aGUgc3RyZWFtLgorICAgICAgICBjYW5jZWwoKTsK ICAgICAgICAgc3RvcChOUFJFU19ORVRXT1JLX0VSUik7CiAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICB9CkBAIC0yNDMsNiArMjU3LDExIEBAIHZvaWQgTmV0c2NhcGVQbHVnaW5TdHJlYW06OnN0 b3AoTlBSZWFzb24gcmVhc29uKQogICAgIG5vdGlmeUFuZERlc3Ryb3lTdHJlYW0ocmVhc29uKTsK IH0KIAordm9pZCBOZXRzY2FwZVBsdWdpblN0cmVhbTo6Y2FuY2VsKCkKK3sKKyAgICBtX3BsdWdp bi0+Y2FuY2VsU3RyZWFtTG9hZCh0aGlzKTsKK30KKwogdm9pZCBOZXRzY2FwZVBsdWdpblN0cmVh bTo6bm90aWZ5QW5kRGVzdHJveVN0cmVhbShOUFJlYXNvbiByZWFzb24pCiB7CiAgICAgQVNTRVJU KCFtX2lzU3RhcnRlZCk7CkBAIC0yNTcsOSArMjc2LDYgQEAgdm9pZCBOZXRzY2FwZVBsdWdpblN0 cmVhbTo6bm90aWZ5QW5kRGVzdHJveVN0cmVhbShOUFJlYXNvbiByZWFzb24pCiAjZW5kaWYgICAg CiAgICAgfQogCi0gICAgaWYgKHJlYXNvbiAhPSBOUFJFU19ET05FKQotICAgICAgICBtX3BsdWdp bi0+Y2FuY2VsU3RyZWFtTG9hZCh0aGlzKTsKLQogICAgIG1fcGx1Z2luLT5yZW1vdmVQbHVnaW5T dHJlYW0odGhpcyk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpblN0cmVhbS5oCmluZGV4IDA3NDM1NWJmN2NhMTE1 OTQwZTkwODgxMWRiMDhiOGJhODgxYTY5ZjUuLmQzNTNjMTkxNjExMWYxYTQ3NDIxMGM5NzRjODU4 NjM4NDM1NzliMDQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uaApAQCAtNTUsNiArNTUsNyBAQCBwdWJs aWM6CiAKICAgICB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBXZWJDb3JlOjpLVVJMJiBy ZXNwb25zZVVSTCwgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHVpbnQzMl90IGxhc3RNb2RpZmllZFRpbWUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYg bWltZVR5cGUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgaGVhZGVycyk7CisgICAgdm9pZCBkaWRG YWlsKGJvb2wgd2FzQ2FuY2VsbGVkKTsKIAogICAgIHZvaWQgc2VuZEphdmFTY3JpcHRTdHJlYW0o Y29uc3QgV2ViQ29yZTo6U3RyaW5nJiByZXF1ZXN0VVJMU3RyaW5nLCBjb25zdCBXZWJDb3JlOjpT dHJpbmcmIHJlc3VsdCk7CiAKQEAgLTY3LDYgKzY4LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAg ICAgIHVpbnQzMl90IGxhc3RNb2RpZmllZFRpbWUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgbWlt ZVR5cGUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgaGVhZGVycyk7CiAgICAgdm9pZCBzdG9wKE5Q UmVhc29uKTsKIAorICAgIHZvaWQgY2FuY2VsKCk7CiAgICAgdm9pZCBub3RpZnlBbmREZXN0cm95 U3RyZWFtKE5QUmVhc29uKTsKIAogICAgIHZvaWQgZGVsaXZlckRhdGEoY29uc3QgY2hhciogYnl0 ZXMsIGludCBsZW5ndGgpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luLmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uaAppbmRleCBiYjNl MjdmYmVkNDE3ZGQxYjBlMWRlYmYzOTUxOWU5ZjIwNmNkNmY4Li45NzlkOGU5NmFjZmQ1ZDkxZWJk ZWEzYzlhMTQxZDNlOTRiMGZiMjkyIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1 Z2lucy9QbHVnaW4uaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4uaApA QCAtNzcsNiArNzcsOSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHN0cmVhbURpZFJlY2Vp dmVSZXNwb25zZSh1aW50NjRfdCBzdHJlYW1JRCwgY29uc3QgV2ViQ29yZTo6S1VSTCYgcmVzcG9u c2VVUkwsIHVpbnQzMl90IHN0cmVhbUxlbmd0aCwgCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25zdCBXZWJDb3Jl OjpTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIGhlYWRlcnMpID0gMDsK IAorICAgIC8vIFRlbGxzIHRoZSBwbHVnLWluIHRoYXQgYSBzdHJlYW0gaGFzIGZhaWxlZCB0byBs b2FkLCBlaXRoZXIgYmVjYXVzZSBvZiBuZXR3b3JrIGVycm9ycyBvciBiZWNhdXNlIHRoZSBsb2Fk IHdhcyBjYW5jZWxsZWQuCisgICAgdmlydHVhbCB2b2lkIHN0cmVhbURpZEZhaWwodWludDY0X3Qg c3RyZWFtSUQsIGJvb2wgd2FzQ2FuY2VsbGVkKSA9IDA7CisKICAgICAvLyBSZXR1cm5zIHRoZSBw bHVnLWluIGNvbnRyb2xsZXIgZm9yIHRoaXMgcGx1Zy1pbi4KICAgICAvLyBGSVhNRTogV2UgY291 bGQganVzdCBoYXZlIHRoZSBjb250cm9sbGVyIGJlIGEgbWVtYmVyIHZhcmlhYmxlIG9mIFBsdWdp bi4KICAgICB2aXJ0dWFsIFBsdWdpbkNvbnRyb2xsZXIqIGNvbnRyb2xsZXIoKSA9IDA7CmRpZmYg LS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCmluZGV4IGE5OGU5Y2I2MmRmZTlj NDIyYTgzOGFiZGVlNTc3NTM5NWI5NTMwYmQuLjZmYjQwZjg0OTY1ZGRiNjhkNTBhMzg4OWZjYmRj OTk2MzZkYTkzZjcgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blZpZXcuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3Bw CkBAIC04Myw5ICs4Myw5IEBAIHByaXZhdGU6CiAgICAgICAgIDogbV9wbHVnaW5WaWV3KHBsdWdp blZpZXcpCiAgICAgICAgICwgbV9zdHJlYW1JRChzdHJlYW1JRCkKICAgICAgICAgLCBtX3JlcXVl c3QocmVxdWVzdCkKKyAgICAgICAgLCBtX3N0cmVhbVdhc0NhbmNlbGxlZChmYWxzZSkKICAgICB7 CiAgICAgfQotCiAgICAgLy8gTmV0c2NhcGVQbHVnaW5TdHJlYW1Mb2FkZXJDbGllbnQKICAgICB2 aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZVJlc3BvbnNlKE5ldHNjYXBlUGx1Z0luU3RyZWFtTG9hZGVy KiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYpOwogICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZl RGF0YShOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlciosIGNvbnN0IGNoYXIqLCBpbnQpOwpAQCAt OTYsNiArOTYsMTAgQEAgcHJpdmF0ZToKICAgICB1aW50NjRfdCBtX3N0cmVhbUlEOwogICAgIGNv bnN0IFJlc291cmNlUmVxdWVzdCBtX3JlcXVlc3Q7CiAgICAgCisgICAgLy8gVHJ1ZSBpZiB0aGUg c3RyZWFtIHdhcyBleHBsaWNpdGx5IGNhbmNlbGxlZCBieSBjYWxsaW5nIGNhbmNlbCgpLgorICAg IC8vIChBcyBvcHBvc2VkIHRvIGJlaW5nIGNhbmNlbGxlZCBieSB0aGUgdXNlciBoaXR0aW5nIHRo ZSBzdG9wIGJ1dHRvbiBmb3IgZXhhbXBsZS4KKyAgICBib29sIG1fc3RyZWFtV2FzQ2FuY2VsbGVk OworICAgIAogICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcj4gbV9sb2FkZXI7 CiB9OwogCkBAIC0xMTcsNiArMTIxLDcgQEAgdm9pZCBQbHVnaW5WaWV3OjpTdHJlYW06OmNhbmNl bCgpCiB7CiAgICAgQVNTRVJUKG1fbG9hZGVyKTsKIAorICAgIG1fc3RyZWFtV2FzQ2FuY2VsbGVk ID0gdHJ1ZTsKICAgICBtX2xvYWRlci0+Y2FuY2VsKG1fbG9hZGVyLT5jYW5jZWxsZWRFcnJvcigp KTsKICAgICBtX2xvYWRlciA9IDA7CiB9CkBAIC0xNzAsNyArMTc1LDE1IEBAIHZvaWQgUGx1Z2lu Vmlldzo6U3RyZWFtOjpkaWRSZWNlaXZlRGF0YShOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlcios IGNvbnN0IGNoYXIqCiAKIHZvaWQgUGx1Z2luVmlldzo6U3RyZWFtOjpkaWRGYWlsKE5ldHNjYXBl UGx1Z0luU3RyZWFtTG9hZGVyKiwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpIAogewotICAg IC8vIEZJWE1FOiBJbXBsZW1lbnQuCisgICAgLy8gV2UgZG9uJ3Qgd2FudCB0byBjYWxsIHN0cmVh bURpZEZhaWwgaWYgdGhlIHN0cmVhbSB3YXMgZXhwbGljaXRseSBjYW5jZWxsZWQgYnkgdGhlIHBs dWctaW4uCisgICAgaWYgKG1fc3RyZWFtV2FzQ2FuY2VsbGVkKQorICAgICAgICByZXR1cm47CisK KyAgICAvLyBDYWxsaW5nIHN0cmVhbURpZEZhaWwgY291bGQgY2F1c2UgdXMgdG8gYmUgZGVsZXRl ZCwgc28gd2UgaG9sZCBvbiB0byBhIHJlZmVyZW5jZSBoZXJlLgorICAgIFJlZlB0cjxTdHJlYW0+ IHByb3RlY3QodGhpcyk7CisKKyAgICBtX3BsdWdpblZpZXctPm1fcGx1Z2luLT5zdHJlYW1EaWRG YWlsKG1fc3RyZWFtSUQsIGVycm9yLmlzQ2FuY2VsbGF0aW9uKCkpOworICAgIG1fcGx1Z2luVmll dy0+cmVtb3ZlU3RyZWFtKHRoaXMpOwogfQogCiB2b2lkIFBsdWdpblZpZXc6OlN0cmVhbTo6ZGlk RmluaXNoTG9hZGluZyhOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlciopCg==