43288 2010-07-30 16:54:50 -0700 Add an NPObject class template helper to TestNetscapePlugin 2010-08-01 12:40:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit-ews webkit.review.bot oldest_to_newest 258479 0 andersca 2010-07-30 16:54:50 -0700 Add an NPObject class template helper to TestNetscapePlugin 258481 1 63127 andersca 2010-07-30 16:59:30 -0700 Created attachment 63127 Patch 258482 2 webkit.review.bot 2010-07-30 17:00:47 -0700 Attachment 63127 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h:38: Extra space before ( in function call [whitespace/parens] [4] WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h:140: One space before end of line comments [whitespace/comments] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 258485 3 webkit-ews 2010-07-30 17:05:47 -0700 Attachment 63127 did not build on qt: Build output: http://queues.webkit.org/results/3618299 258490 4 63128 andersca 2010-07-30 17:10:01 -0700 Created attachment 63128 Patch 258492 5 webkit.review.bot 2010-07-30 17:13:40 -0700 Attachment 63128 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h:39: Extra space before ( in function call [whitespace/parens] [4] WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h:141: One space before end of line comments [whitespace/comments] [5] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 258693 6 andersca 2010-08-01 12:40:12 -0700 Committed r64443: <http://trac.webkit.org/changeset/64443> 63127 2010-07-30 16:59:30 -0700 2010-07-30 17:09:58 -0700 Patch bug-43288-20100730165929.patch text/plain 9507 andersca ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4M2RlZDIyZGZlM2I3MWNlOTYzYzk0NDUwNDgzY2VkOGE5YTFjMzEzLi5jYzM5ZmU4 MjUwZDNiMDAxYmI3ODY1MGRhODQ1NmJiMjllOWRhM2MzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDggQEAK IDIwMTAtMDctMzAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYW4gTlBPYmpl Y3QgY2xhc3MgdGVtcGxhdGUgaGVscGVyIHRvIFRlc3ROZXRzY2FwZVBsdWdpbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMyODgKKworICAgICAgICAq IER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9QbHVnaW5UZXN0Lmg6CisgICAgICAg IEFkZCBzb21lIHRlbXBsYXRlIG1hZ2ljIHRvIGJlIGFibGUgdG8gZmlndXJlIG91dCBpZiBhIGNs YXNzIGhhcyBhIG1lbWJlciBmdW5jdGlvbiBvZiBhIGdpdmVuIHR5cGUuCisKKyAgICAgICAgKFBs dWdpblRlc3Q6Ok9iamVjdDo6Y3JlYXRlKToKKyAgICAgICAgQ3JlYXRlIGFuIG9iamVjdC4KKwor ICAgICAgICAoUGx1Z2luVGVzdDo6T2JqZWN0OjppbnZva2VEZWZhdWx0KToKKyAgICAgICAgQWRk IGR1bW15IGZ1bmN0aW9uLCB0aGlzIHNob3VsZCBuZXZlciBiZSBjYWxsZWQuCisKKyAgICAgICAg KFBsdWdpblRlc3Q6Ok9iamVjdDo6T2JqZWN0KToKKyAgICAgICAgSW5pdGlhbGl6ZSBtX3BsdWdp blRlc3QgdG8gMC4KKworICAgICAgICAoUGx1Z2luVGVzdDo6T2JqZWN0Ojp+T2JqZWN0KToKKyAg ICAgICAgQWRkIHZpcnR1YWwgZGVzdHJ1Y3Rvci4KKworICAgICAgICAoUGx1Z2luVGVzdDo6T2Jq ZWN0OjpOUF9BbGxvY2F0ZSk6CisgICAgICAgIENyZWF0ZSBhIG5ldyBvYmplY3QuCisKKyAgICAg ICAgKFBsdWdpblRlc3Q6Ok9iamVjdDo6TlBfRGVhbGxvY2F0ZSk6CisgICAgICAgIERlbGV0ZSB0 aGUgb2JqZWN0LgorCisgICAgICAgIChQbHVnaW5UZXN0OjpPYmplY3Q6Ok5QX0ludm9rZURlZmF1 bHQpOgorICAgICAgICBDYWxsIGludm9rZURlZmF1bHQuCisKKyAgICAgICAgKFBsdWdpblRlc3Q6 Ok9iamVjdDo6bnBDbGFzcyk6CisgICAgICAgIEluaXRpYWxpemUgdGhlIE5QQ2xhc3Mgc3RydWN0 LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL0Rv Y3VtZW50T3BlbkluRGVzdHJveVN0cmVhbS5jcHA6CisgICAgICAgIChEb2N1bWVudE9wZW5JbkRl c3Ryb3lTdHJlYW06Ok5QUF9EZXN0cm95U3RyZWFtKToKKyAgICAgICAgTW92ZSB0aGlzIGlubGlu ZS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9UZXN0cy9Q bHVnaW5TY3JpcHRhYmxlTlBPYmplY3RJbnZva2VEZWZhdWx0LmNwcDoKKyAgICAgICAgKFBsdWdp blNjcmlwdGFibGVOUE9iamVjdEludm9rZURlZmF1bHQ6Ok5QT2JqZWN0V2l0aEludm9rZURlZmF1 bHQ6Omludm9rZURlZmF1bHQpOgorICAgICAgICAoUGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0SW52 b2tlRGVmYXVsdDo6TlBQX0dldFZhbHVlKToKKyAgICAgICAgVXNlIHRoZSBQbHVnaW5UZXN0OjpP YmplY3QgY2xhc3MgdGVtcGxhdGUuCisKKzIwMTAtMDctMzAgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBUcnkgdG8gZml4IHRoZSBsYXlvdXQgdGVzdCBm YWlsdXJlcy4KIAogICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3VuaXgvVGVzdE5ldHNjYXBlUGx1 Z2luL1Rlc3ROZXRzY2FwZVBsdWdpbi5jcHA6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vUGx1Z2luVGVzdC5oIGIvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1BsdWdpblRlc3QuaAppbmRleCAyMzQ5 MzdiNWNiZjFjZjVkMTUyMzE0ZDBjMzlkMjAzZWVjMzk1YTYxLi4wMDQ0ZTg5YjJiZTgxMzM1ZWM5 YTk1ZDQzMWIzODUxNThkZjgxMjlkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vUGx1Z2luVGVzdC5oCisrKyBiL1dlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9QbHVnaW5UZXN0LmgKQEAgLTMwLDYgKzMw LDIwIEBACiAjaW5jbHVkZSA8bWFwPgogI2luY2x1ZGUgPHN0cmluZz4KIAorLy8gSGVscGVyIGNs YXNzZXMgZm9yIGltcGxlbWVudGluZyBoYXNfbWVtYmVyCit0eXBlZGVmIGNoYXIgKCZub190YWcp WzFdOwordHlwZWRlZiBjaGFyICgmeWVzX3RhZylbMl07CisKKyNkZWZpbmUgREVGSU5FX0hBU19N RU1CRVJfQ0hFQ0sobWVtYmVyLCByZXR1cm5UeXBlLCBhcmd1bWVudFR5cGVzKSBcCit0ZW1wbGF0 ZTx0eXBlbmFtZSBULCByZXR1cm5UeXBlIChUOjoqbWVtYmVyKSBhcmd1bWVudFR5cGVzPiBzdHJ1 Y3QgcG1mX2hlbHBlciB7fTsgXAordGVtcGxhdGU8dHlwZW5hbWUgVD4gbm9fdGFnIGhhc19tZW1i ZXJfIyNtZW1iZXIjI19oZWxwZXIoLi4uKTsgXAordGVtcGxhdGU8dHlwZW5hbWUgVD4geWVzX3Rh ZyBoYXNfbWVtYmVyXyMjbWVtYmVyIyNfaGVscGVyKHBtZl9oZWxwZXI8VCwgJlQ6Om1lbWJlciA+ ICopOyBcCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdHJ1Y3QgaGFzX21lbWJlcl8jI21lbWJlciB7 IFwKK3N0YXRpYyBjb25zdCBib29sIHZhbHVlID0gc2l6ZW9mKGhhc19tZW1iZXJfIyNtZW1iZXIj I19oZWxwZXI8VD4oMCkpID09IHNpemVvZih5ZXNfdGFnKTsgXAorfTsKKworREVGSU5FX0hBU19N RU1CRVJfQ0hFQ0soaW52b2tlRGVmYXVsdCwgYm9vbCwgKGNvbnN0IE5QVmFyaWFudCosIHVpbnQz Ml90LCBOUFZhcmlhbnQqIHJlc3VsdCkpCisKIGNsYXNzIFBsdWdpblRlc3QgewogcHVibGljOgog ICAgIHN0YXRpYyBQbHVnaW5UZXN0KiBjcmVhdGUoTlBQLCBjb25zdCBzdGQ6OnN0cmluZyYgaWRl bnRpZmllcik7CkBAIC02NCw2ICs3OCw3NCBAQCBwcm90ZWN0ZWQ6CiAKICAgICBjb25zdCBzdGQ6 OnN0cmluZyYgaWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQogCisg ICAgLy8gTlBPYmplY3QgaGVscGVyIHRlbXBsYXRlLgorICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+ IHN0cnVjdCBPYmplY3QgOiBOUE9iamVjdCB7CisgICAgcHVibGljOgorICAgICAgICBzdGF0aWMg TlBPYmplY3QqIGNyZWF0ZShQbHVnaW5UZXN0KiBwbHVnaW5UZXN0KQorICAgICAgICB7CisgICAg ICAgICAgICBPYmplY3QqIG9iamVjdCA9IHN0YXRpY19jYXN0PE9iamVjdCo+KHBsdWdpblRlc3Qt Pk5QTl9DcmVhdGVPYmplY3QobnBDbGFzcygpKSk7CisKKyAgICAgICAgICAgIG9iamVjdC0+bV9w bHVnaW5UZXN0ID0gcGx1Z2luVGVzdDsKKyAgICAgICAgICAgIHJldHVybiBvYmplY3Q7CisgICAg ICAgIH0KKyAgICAKKyAgICAgICAgLy8gVGhlc2Ugc2hvdWxkIG5ldmVyIGJlIGNhbGxlZC4KKyAg ICAgICAgYm9vbCBpbnZva2VEZWZhdWx0KGNvbnN0IE5QVmFyaWFudCosIHVpbnQzMl90LCBOUFZh cmlhbnQqIHJlc3VsdCkKKyAgICAgICAgeworICAgICAgICAgICAgYXNzZXJ0KGZhbHNlKTsKKyAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorCisgICAgcHJvdGVjdGVkOgorICAg ICAgICBPYmplY3QoKQorICAgICAgICAgICAgOiBtX3BsdWdpblRlc3QoMCkKKyAgICAgICAgewor ICAgICAgICB9CisgICAgICAgIAorICAgICAgICB2aXJ0dWFsIH5PYmplY3QoKSAKKyAgICAgICAg eyAKKyAgICAgICAgfQorCisgICAgcHJpdmF0ZToKKyAgICAgICAgc3RhdGljIE5QT2JqZWN0KiBO UF9BbGxvY2F0ZShOUFAgbnBwLCBOUENsYXNzKiBhQ2xhc3MpCisgICAgICAgIHsKKyAgICAgICAg ICAgIHJldHVybiBuZXcgVDsKKyAgICAgICAgfQorCisgICAgICAgIHN0YXRpYyB2b2lkIE5QX0Rl YWxsb2NhdGUoTlBPYmplY3QqIG5wT2JqZWN0KQorICAgICAgICB7CisgICAgICAgICAgICBkZWxl dGUgc3RhdGljX2Nhc3Q8VCo+KG5wT2JqZWN0KTsKKyAgICAgICAgfQorCisgICAgICAgIHN0YXRp YyBib29sIE5QX0ludm9rZURlZmF1bHQoTlBPYmplY3QqIG5wT2JqZWN0LCBjb25zdCBOUFZhcmlh bnQqIGFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1bHQp CisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxUKj4obnBPYmplY3Qp LT5pbnZva2VEZWZhdWx0KGFyZ3VtZW50cywgYXJndW1lbnRDb3VudCwgcmVzdWx0KTsKKyAgICAg ICAgfQorCisgICAgICAgIHN0YXRpYyBOUENsYXNzKiBucENsYXNzKCkKKyAgICAgICAgeworICAg ICAgICAgICAgc3RhdGljIE5QQ2xhc3MgbnBDbGFzcyA9IHsKKyAgICAgICAgICAgICAgICBOUF9D TEFTU19TVFJVQ1RfVkVSU0lPTiwgCisgICAgICAgICAgICAgICAgTlBfQWxsb2NhdGUsCisgICAg ICAgICAgICAgICAgTlBfRGVhbGxvY2F0ZSwKKyAgICAgICAgICAgICAgICAwLCAvLyBOUENsYXNz OjppbnZhbGlkYXRlCisgICAgICAgICAgICAgICAgMCwgLy8gTlBDbGFzczo6aGFzTWV0aG9kCisg ICAgICAgICAgICAgICAgMCwgLy8gTlBDbGFzczo6aW52b2tlCisgICAgICAgICAgICAgICAgaGFz X21lbWJlcl9pbnZva2VEZWZhdWx0PFQ+Ojp2YWx1ZSA/IE5QX0ludm9rZURlZmF1bHQgOiAwLAor ICAgICAgICAgICAgICAgIDAsIC8vIE5QQ2xhc3M6Omhhc1Byb3BlcnR5CisgICAgICAgICAgICAg ICAgMCwgLy8gTlBDbGFzczo6Z2V0UHJvcGVydHkKKyAgICAgICAgICAgICAgICAwLCAvLyBOUENs YXNzOjpzZXRQcm9wZXJ0eQorICAgICAgICAgICAgICAgIDAsIC8vIE5QQ2xhc3M6OnJlbW92ZVBy b3BlcnR5CisgICAgICAgICAgICAgICAgMCwgLy8gTlBDbGFzczo6ZW51bWVyYXRlCisgICAgICAg ICAgICAgICAgMCAgLy8gTlBDbGFzczo6Y29uc3RydWN0CisgICAgICAgICAgICB9OworICAgICAg ICAgICAgCisgICAgICAgICAgICByZXR1cm4gJm5wQ2xhc3M7CisgICAgICAgIH07CisKKyAgICAg ICAgUGx1Z2luVGVzdCogbV9wbHVnaW5UZXN0OworICAgIH07CisgICAgCiBwcml2YXRlOgogICAg IHR5cGVkZWYgUGx1Z2luVGVzdCogKCpDcmVhdGVUZXN0RnVuY3Rpb24pKE5QUCwgY29uc3Qgc3Rk OjpzdHJpbmcmKTsKICAgICAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVl L1Rlc3ROZXRzY2FwZVBsdWdJbi9UZXN0cy9Eb2N1bWVudE9wZW5JbkRlc3Ryb3lTdHJlYW0uY3Bw IGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL0Rv Y3VtZW50T3BlbkluRGVzdHJveVN0cmVhbS5jcHAKaW5kZXggMTBmZjI2MzNhNTE4NDFkMmQ2OGUx MGVkYzYwZTcxMjRjZmE4ZDZhOS4uNjllNzA2ZWE0MmI4NDIzNjhlNjhjMjc2OGIxZGQwZTVlNTE4 ZjhhMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBl UGx1Z0luL1Rlc3RzL0RvY3VtZW50T3BlbkluRGVzdHJveVN0cmVhbS5jcHAKKysrIGIvV2ViS2l0 VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL0RvY3VtZW50T3Bl bkluRGVzdHJveVN0cmVhbS5jcHAKQEAgLTQwLDE5ICs0MCwxNyBAQCBwdWJsaWM6CiAgICAgfQog CiBwcml2YXRlOgotICAgIHZpcnR1YWwgTlBFcnJvciBOUFBfRGVzdHJveVN0cmVhbShOUFN0cmVh bSosIE5QUmVhc29uKTsKKyAgICB2aXJ0dWFsIE5QRXJyb3IgTlBQX0Rlc3Ryb3lTdHJlYW0oTlBT dHJlYW0qLCBOUFJlYXNvbikKKyAgICB7CisgICAgICAgIGlmIChtX3Nob3VsZE9wZW4pIHsKKyAg ICAgICAgICAgIHRlc3REb2N1bWVudE9wZW4obV9ucHApOworICAgICAgICAgICAgbV9zaG91bGRP cGVuID0gZmFsc2U7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIHJldHVybiBOUEVSUl9O T19FUlJPUjsKKyAgICB9ICAgICAgICAKIAogICAgIGJvb2wgbV9zaG91bGRPcGVuOwogfTsKIAot TlBFcnJvciBEb2N1bWVudE9wZW5JbkRlc3Ryb3lTdHJlYW06Ok5QUF9EZXN0cm95U3RyZWFtKE5Q U3RyZWFtKiwgTlBSZWFzb24pCi17Ci0gICAgaWYgKG1fc2hvdWxkT3BlbikgewotICAgICAgICB0 ZXN0RG9jdW1lbnRPcGVuKG1fbnBwKTsKLSAgICAgICAgbV9zaG91bGRPcGVuID0gZmFsc2U7Ci0g ICAgfQotICAgIAotICAgIHJldHVybiBOUEVSUl9OT19FUlJPUjsKLX0KLQogc3RhdGljIFBsdWdp blRlc3Q6OlJlZ2lzdGVyPERvY3VtZW50T3BlbkluRGVzdHJveVN0cmVhbT4gZG9jdW1lbnRPcGVu SW5EZXN0cm95U3RyZWFtKCJkb2N1bWVudC1vcGVuLWluLWRlc3Ryb3ktc3RyZWFtIik7CmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vVGVz dHMvUGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0SW52b2tlRGVmYXVsdC5jcHAgYi9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vVGVzdHMvUGx1Z2luU2NyaXB0YWJs ZU5QT2JqZWN0SW52b2tlRGVmYXVsdC5jcHAKaW5kZXggMzBjNDYzYjdiNTk4ZGM1YjQ0MWUxOWNk NWZjMzQxZWJkNmVmNzA4ZS4uOTU5ZTE4MmU0NjNmNjEyZjY5NTlmZThiMmJlY2NjMGExMzI3ODVi MSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1 Z0luL1Rlc3RzL1BsdWdpblNjcmlwdGFibGVOUE9iamVjdEludm9rZURlZmF1bHQuY3BwCisrKyBi L1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9UZXN0cy9QbHVn aW5TY3JpcHRhYmxlTlBPYmplY3RJbnZva2VEZWZhdWx0LmNwcApAQCAtMjcsNDQgKzI3LDYgQEAK IAogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAotc3RhdGljIGJvb2wgaW52b2tlRGVmYXVsdChOUE9i amVjdCosIGNvbnN0IE5QVmFyaWFudCosIHVpbnQzMl90LCBOUFZhcmlhbnQqIHJlc3VsdCkKLXsK LSAgICBJTlQzMl9UT19OUFZBUklBTlQoMSwgKnJlc3VsdCk7Ci0gICAgcmV0dXJuIHRydWU7Ci19 Ci0KLXN0YXRpYyBOUENsYXNzIG5wQ2xhc3NXaXRoSW52b2tlRGVmYXVsdCA9IHsgCi0gICAgTlBf Q0xBU1NfU1RSVUNUX1ZFUlNJT04sIAotICAgIDAsIC8vIE5QQ2xhc3M6OmFsbG9jYXRlCi0gICAg MCwgLy8gTlBDbGFzczo6ZGVhbGxvY2F0ZQotICAgIDAsIC8vIE5QQ2xhc3M6OmludmFsaWRhdGUK LSAgICAwLCAvLyBOUENsYXNzOjpoYXNNZXRob2QKLSAgICAwLCAvLyBOUENsYXNzOjppbnZva2UK LSAgICBpbnZva2VEZWZhdWx0LAotICAgIDAsIC8vIE5QQ2xhc3M6Omhhc1Byb3BlcnR5Ci0gICAg MCwgLy8gTlBDbGFzczo6Z2V0UHJvcGVydHkKLSAgICAwLCAvLyBOUENsYXNzOjpzZXRQcm9wZXJ0 eQotICAgIDAsIC8vIE5QQ2xhc3M6OnJlbW92ZVByb3BlcnR5Ci0gICAgMCwgLy8gTlBDbGFzczo6 ZW51bWVyYXRlCi0gICAgMCAgLy8gTlBDbGFzczo6Y29uc3RydWN0Ci19OwotCi1zdGF0aWMgTlBD bGFzcyBucENsYXNzV2l0aG91dEludm9rZURlZmF1bHQgPSB7IAotICAgIE5QX0NMQVNTX1NUUlVD VF9WRVJTSU9OLCAKLSAgICAwLCAvLyBOUENsYXNzOjphbGxvY2F0ZQotICAgIDAsIC8vIE5QQ2xh c3M6OmRlYWxsb2NhdGUKLSAgICAwLCAvLyBOUENsYXNzOjppbnZhbGlkYXRlCi0gICAgMCwgLy8g TlBDbGFzczo6aGFzTWV0aG9kCi0gICAgMCwgLy8gTlBDbGFzczo6aW52b2tlCi0gICAgMCwgLy8g TlBDbGFzczo6aW52b2tlRGVmYXVsdCwKLSAgICAwLCAvLyBOUENsYXNzOjpoYXNQcm9wZXJ0eQot ICAgIDAsIC8vIE5QQ2xhc3M6OmdldFByb3BlcnR5Ci0gICAgMCwgLy8gTlBDbGFzczo6c2V0UHJv cGVydHkKLSAgICAwLCAvLyBOUENsYXNzOjpyZW1vdmVQcm9wZXJ0eQotICAgIDAsIC8vIE5QQ2xh c3M6OmVudW1lcmF0ZQotICAgIDAgIC8vIE5QQ2xhc3M6OmNvbnN0cnVjdAotfTsKLQogLy8gQSB0 ZXN0IHdoZXJlIHRoZSBwbHVnLWlucyBzY3JpcHRhYmxlIG9iamVjdCBlaXRoZXIgaGFzIG9yIGRv ZXNuJ3QgaGF2ZSBhbiBpbnZva2VEZWZhdWx0IGZ1bmN0aW9uLgogY2xhc3MgUGx1Z2luU2NyaXB0 YWJsZU5QT2JqZWN0SW52b2tlRGVmYXVsdCA6IHB1YmxpYyBQbHVnaW5UZXN0IHsKIHB1YmxpYzoK QEAgLTc0LDIzICszNiwzMiBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRlOgorICAgIHN0cnVj dCBOUE9iamVjdFdpdGhvdXRJbnZva2VEZWZhdWx0IDogT2JqZWN0PE5QT2JqZWN0V2l0aG91dElu dm9rZURlZmF1bHQ+IHsgfTsKKworICAgIHN0cnVjdCBOUE9iamVjdFdpdGhJbnZva2VEZWZhdWx0 IDogT2JqZWN0PE5QT2JqZWN0V2l0aEludm9rZURlZmF1bHQ+IHsgCisgICAgcHVibGljOgorICAg ICAgICBib29sIGludm9rZURlZmF1bHQoY29uc3QgTlBWYXJpYW50KiwgdWludDMyX3QsIE5QVmFy aWFudCogcmVzdWx0KQorICAgICAgICB7CisgICAgICAgICAgICBJTlQzMl9UT19OUFZBUklBTlQo MSwgKnJlc3VsdCk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgIH07 CisKICAgICB2aXJ0dWFsIE5QRXJyb3IgTlBQX0dldFZhbHVlKE5QUFZhcmlhYmxlIHZhcmlhYmxl LCB2b2lkICp2YWx1ZSkKICAgICB7CiAgICAgICAgIGlmICh2YXJpYWJsZSAhPSBOUFBWcGx1Z2lu U2NyaXB0YWJsZU5QT2JqZWN0KQogICAgICAgICAgICAgcmV0dXJuIE5QRVJSX0dFTkVSSUNfRVJS T1I7CiAKLSAgICAgICAgTlBDbGFzcyogbnBDbGFzczsKKyAgICAgICAgTlBPYmplY3QqIG9iamVj dDsKICAgICAgICAgaWYgKGlkZW50aWZpZXIoKSA9PSAicGx1Z2luLXNjcmlwdGFibGUtbnBvYmpl Y3QtaW52b2tlLWRlZmF1bHQiKQotICAgICAgICAgICAgbnBDbGFzcyA9ICZucENsYXNzV2l0aElu dm9rZURlZmF1bHQ7CisgICAgICAgICAgICBvYmplY3QgPSBOUE9iamVjdFdpdGhJbnZva2VEZWZh dWx0OjpjcmVhdGUodGhpcyk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIG5wQ2xhc3MgPSAm bnBDbGFzc1dpdGhvdXRJbnZva2VEZWZhdWx0OworICAgICAgICAgICAgb2JqZWN0ID0gTlBPYmpl Y3RXaXRob3V0SW52b2tlRGVmYXVsdDo6Y3JlYXRlKHRoaXMpOwogICAgICAgICAKLSAgICAgICAg KihOUE9iamVjdCoqKXZhbHVlID0gTlBOX0NyZWF0ZU9iamVjdChucENsYXNzKTsKKyAgICAgICAg KihOUE9iamVjdCoqKXZhbHVlID0gb2JqZWN0OwogICAgICAgICAKICAgICAgICAgcmV0dXJuIE5Q RVJSX05PX0VSUk9SOwogICAgIH0KLQotICAgIE5QT2JqZWN0KiBtX3NjcmlwdGFibGVPYmplY3Q7 CiB9OwogCiBzdGF0aWMgUGx1Z2luVGVzdDo6UmVnaXN0ZXI8UGx1Z2luU2NyaXB0YWJsZU5QT2Jq ZWN0SW52b2tlRGVmYXVsdD4gcGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0SW52b2tlRGVmYXVsdCgi cGx1Z2luLXNjcmlwdGFibGUtbnBvYmplY3QtaW52b2tlLWRlZmF1bHQiKTsK 63128 2010-07-30 17:10:01 -0700 2010-08-01 08:58:44 -0700 Patch bug-43288-20100730170959.patch text/plain 9585 andersca ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4M2RlZDIyZGZlM2I3MWNlOTYzYzk0NDUwNDgzY2VkOGE5YTFjMzEzLi5jYzM5ZmU4 MjUwZDNiMDAxYmI3ODY1MGRhODQ1NmJiMjllOWRhM2MzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDggQEAK IDIwMTAtMDctMzAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYW4gTlBPYmpl Y3QgY2xhc3MgdGVtcGxhdGUgaGVscGVyIHRvIFRlc3ROZXRzY2FwZVBsdWdpbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMyODgKKworICAgICAgICAq IER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9QbHVnaW5UZXN0Lmg6CisgICAgICAg IEFkZCBzb21lIHRlbXBsYXRlIG1hZ2ljIHRvIGJlIGFibGUgdG8gZmlndXJlIG91dCBpZiBhIGNs YXNzIGhhcyBhIG1lbWJlciBmdW5jdGlvbiBvZiBhIGdpdmVuIHR5cGUuCisKKyAgICAgICAgKFBs dWdpblRlc3Q6Ok9iamVjdDo6Y3JlYXRlKToKKyAgICAgICAgQ3JlYXRlIGFuIG9iamVjdC4KKwor ICAgICAgICAoUGx1Z2luVGVzdDo6T2JqZWN0OjppbnZva2VEZWZhdWx0KToKKyAgICAgICAgQWRk IGR1bW15IGZ1bmN0aW9uLCB0aGlzIHNob3VsZCBuZXZlciBiZSBjYWxsZWQuCisKKyAgICAgICAg KFBsdWdpblRlc3Q6Ok9iamVjdDo6T2JqZWN0KToKKyAgICAgICAgSW5pdGlhbGl6ZSBtX3BsdWdp blRlc3QgdG8gMC4KKworICAgICAgICAoUGx1Z2luVGVzdDo6T2JqZWN0Ojp+T2JqZWN0KToKKyAg ICAgICAgQWRkIHZpcnR1YWwgZGVzdHJ1Y3Rvci4KKworICAgICAgICAoUGx1Z2luVGVzdDo6T2Jq ZWN0OjpOUF9BbGxvY2F0ZSk6CisgICAgICAgIENyZWF0ZSBhIG5ldyBvYmplY3QuCisKKyAgICAg ICAgKFBsdWdpblRlc3Q6Ok9iamVjdDo6TlBfRGVhbGxvY2F0ZSk6CisgICAgICAgIERlbGV0ZSB0 aGUgb2JqZWN0LgorCisgICAgICAgIChQbHVnaW5UZXN0OjpPYmplY3Q6Ok5QX0ludm9rZURlZmF1 bHQpOgorICAgICAgICBDYWxsIGludm9rZURlZmF1bHQuCisKKyAgICAgICAgKFBsdWdpblRlc3Q6 Ok9iamVjdDo6bnBDbGFzcyk6CisgICAgICAgIEluaXRpYWxpemUgdGhlIE5QQ2xhc3Mgc3RydWN0 LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL0Rv Y3VtZW50T3BlbkluRGVzdHJveVN0cmVhbS5jcHA6CisgICAgICAgIChEb2N1bWVudE9wZW5JbkRl c3Ryb3lTdHJlYW06Ok5QUF9EZXN0cm95U3RyZWFtKToKKyAgICAgICAgTW92ZSB0aGlzIGlubGlu ZS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9UZXN0cy9Q bHVnaW5TY3JpcHRhYmxlTlBPYmplY3RJbnZva2VEZWZhdWx0LmNwcDoKKyAgICAgICAgKFBsdWdp blNjcmlwdGFibGVOUE9iamVjdEludm9rZURlZmF1bHQ6Ok5QT2JqZWN0V2l0aEludm9rZURlZmF1 bHQ6Omludm9rZURlZmF1bHQpOgorICAgICAgICAoUGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0SW52 b2tlRGVmYXVsdDo6TlBQX0dldFZhbHVlKToKKyAgICAgICAgVXNlIHRoZSBQbHVnaW5UZXN0OjpP YmplY3QgY2xhc3MgdGVtcGxhdGUuCisKKzIwMTAtMDctMzAgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBUcnkgdG8gZml4IHRoZSBsYXlvdXQgdGVzdCBm YWlsdXJlcy4KIAogICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3VuaXgvVGVzdE5ldHNjYXBlUGx1 Z2luL1Rlc3ROZXRzY2FwZVBsdWdpbi5jcHA6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vUGx1Z2luVGVzdC5oIGIvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1BsdWdpblRlc3QuaAppbmRleCAyMzQ5 MzdiNWNiZjFjZjVkMTUyMzE0ZDBjMzlkMjAzZWVjMzk1YTYxLi43N2UwZWU1ZTkzY2FhZGQ0ZDkw ZTY0MjJjNWY5NmIxNjgwMTliYjE0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4vUGx1Z2luVGVzdC5oCisrKyBiL1dlYktpdFRvb2xzL0R1 bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9QbHVnaW5UZXN0LmgKQEAgLTI3LDkgKzI3 LDI0IEBACiAjZGVmaW5lIFBsdWdpblRlc3RfaAogCiAjaW5jbHVkZSA8V2ViS2l0L25wZnVuY3Rp b25zLmg+CisjaW5jbHVkZSA8YXNzZXJ0Lmg+CiAjaW5jbHVkZSA8bWFwPgogI2luY2x1ZGUgPHN0 cmluZz4KIAorLy8gSGVscGVyIGNsYXNzZXMgZm9yIGltcGxlbWVudGluZyBoYXNfbWVtYmVyCit0 eXBlZGVmIGNoYXIgKCZub190YWcpWzFdOwordHlwZWRlZiBjaGFyICgmeWVzX3RhZylbMl07CisK KyNkZWZpbmUgREVGSU5FX0hBU19NRU1CRVJfQ0hFQ0sobWVtYmVyLCByZXR1cm5UeXBlLCBhcmd1 bWVudFR5cGVzKSBcCit0ZW1wbGF0ZTx0eXBlbmFtZSBULCByZXR1cm5UeXBlIChUOjoqbWVtYmVy KSBhcmd1bWVudFR5cGVzPiBzdHJ1Y3QgcG1mX2hlbHBlciB7fTsgXAordGVtcGxhdGU8dHlwZW5h bWUgVD4gbm9fdGFnIGhhc19tZW1iZXJfIyNtZW1iZXIjI19oZWxwZXIoLi4uKTsgXAordGVtcGxh dGU8dHlwZW5hbWUgVD4geWVzX3RhZyBoYXNfbWVtYmVyXyMjbWVtYmVyIyNfaGVscGVyKHBtZl9o ZWxwZXI8VCwgJlQ6Om1lbWJlciA+ICopOyBcCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdHJ1Y3Qg aGFzX21lbWJlcl8jI21lbWJlciB7IFwKK3N0YXRpYyBjb25zdCBib29sIHZhbHVlID0gc2l6ZW9m KGhhc19tZW1iZXJfIyNtZW1iZXIjI19oZWxwZXI8VD4oMCkpID09IHNpemVvZih5ZXNfdGFnKTsg XAorfTsKKworREVGSU5FX0hBU19NRU1CRVJfQ0hFQ0soaW52b2tlRGVmYXVsdCwgYm9vbCwgKGNv bnN0IE5QVmFyaWFudCosIHVpbnQzMl90LCBOUFZhcmlhbnQqIHJlc3VsdCkpCisKIGNsYXNzIFBs dWdpblRlc3QgewogcHVibGljOgogICAgIHN0YXRpYyBQbHVnaW5UZXN0KiBjcmVhdGUoTlBQLCBj b25zdCBzdGQ6OnN0cmluZyYgaWRlbnRpZmllcik7CkBAIC02NCw2ICs3OSw3NCBAQCBwcm90ZWN0 ZWQ6CiAKICAgICBjb25zdCBzdGQ6OnN0cmluZyYgaWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJu IG1faWRlbnRpZmllcjsgfQogCisgICAgLy8gTlBPYmplY3QgaGVscGVyIHRlbXBsYXRlLgorICAg IHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0cnVjdCBPYmplY3QgOiBOUE9iamVjdCB7CisgICAgcHVi bGljOgorICAgICAgICBzdGF0aWMgTlBPYmplY3QqIGNyZWF0ZShQbHVnaW5UZXN0KiBwbHVnaW5U ZXN0KQorICAgICAgICB7CisgICAgICAgICAgICBPYmplY3QqIG9iamVjdCA9IHN0YXRpY19jYXN0 PE9iamVjdCo+KHBsdWdpblRlc3QtPk5QTl9DcmVhdGVPYmplY3QobnBDbGFzcygpKSk7CisKKyAg ICAgICAgICAgIG9iamVjdC0+bV9wbHVnaW5UZXN0ID0gcGx1Z2luVGVzdDsKKyAgICAgICAgICAg IHJldHVybiBvYmplY3Q7CisgICAgICAgIH0KKyAgICAKKyAgICAgICAgLy8gVGhlc2Ugc2hvdWxk IG5ldmVyIGJlIGNhbGxlZC4KKyAgICAgICAgYm9vbCBpbnZva2VEZWZhdWx0KGNvbnN0IE5QVmFy aWFudCosIHVpbnQzMl90LCBOUFZhcmlhbnQqIHJlc3VsdCkKKyAgICAgICAgeworICAgICAgICAg ICAgYXNzZXJ0KGZhbHNlKTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQor CisgICAgcHJvdGVjdGVkOgorICAgICAgICBPYmplY3QoKQorICAgICAgICAgICAgOiBtX3BsdWdp blRlc3QoMCkKKyAgICAgICAgeworICAgICAgICB9CisgICAgICAgIAorICAgICAgICB2aXJ0dWFs IH5PYmplY3QoKSAKKyAgICAgICAgeyAKKyAgICAgICAgfQorCisgICAgcHJpdmF0ZToKKyAgICAg ICAgc3RhdGljIE5QT2JqZWN0KiBOUF9BbGxvY2F0ZShOUFAgbnBwLCBOUENsYXNzKiBhQ2xhc3Mp CisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiBuZXcgVDsKKyAgICAgICAgfQorCisgICAg ICAgIHN0YXRpYyB2b2lkIE5QX0RlYWxsb2NhdGUoTlBPYmplY3QqIG5wT2JqZWN0KQorICAgICAg ICB7CisgICAgICAgICAgICBkZWxldGUgc3RhdGljX2Nhc3Q8VCo+KG5wT2JqZWN0KTsKKyAgICAg ICAgfQorCisgICAgICAgIHN0YXRpYyBib29sIE5QX0ludm9rZURlZmF1bHQoTlBPYmplY3QqIG5w T2JqZWN0LCBjb25zdCBOUFZhcmlhbnQqIGFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3Vu dCwgTlBWYXJpYW50KiByZXN1bHQpCisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiBzdGF0 aWNfY2FzdDxUKj4obnBPYmplY3QpLT5pbnZva2VEZWZhdWx0KGFyZ3VtZW50cywgYXJndW1lbnRD b3VudCwgcmVzdWx0KTsKKyAgICAgICAgfQorCisgICAgICAgIHN0YXRpYyBOUENsYXNzKiBucENs YXNzKCkKKyAgICAgICAgeworICAgICAgICAgICAgc3RhdGljIE5QQ2xhc3MgbnBDbGFzcyA9IHsK KyAgICAgICAgICAgICAgICBOUF9DTEFTU19TVFJVQ1RfVkVSU0lPTiwgCisgICAgICAgICAgICAg ICAgTlBfQWxsb2NhdGUsCisgICAgICAgICAgICAgICAgTlBfRGVhbGxvY2F0ZSwKKyAgICAgICAg ICAgICAgICAwLCAvLyBOUENsYXNzOjppbnZhbGlkYXRlCisgICAgICAgICAgICAgICAgMCwgLy8g TlBDbGFzczo6aGFzTWV0aG9kCisgICAgICAgICAgICAgICAgMCwgLy8gTlBDbGFzczo6aW52b2tl CisgICAgICAgICAgICAgICAgaGFzX21lbWJlcl9pbnZva2VEZWZhdWx0PFQ+Ojp2YWx1ZSA/IE5Q X0ludm9rZURlZmF1bHQgOiAwLAorICAgICAgICAgICAgICAgIDAsIC8vIE5QQ2xhc3M6Omhhc1By b3BlcnR5CisgICAgICAgICAgICAgICAgMCwgLy8gTlBDbGFzczo6Z2V0UHJvcGVydHkKKyAgICAg ICAgICAgICAgICAwLCAvLyBOUENsYXNzOjpzZXRQcm9wZXJ0eQorICAgICAgICAgICAgICAgIDAs IC8vIE5QQ2xhc3M6OnJlbW92ZVByb3BlcnR5CisgICAgICAgICAgICAgICAgMCwgLy8gTlBDbGFz czo6ZW51bWVyYXRlCisgICAgICAgICAgICAgICAgMCAgLy8gTlBDbGFzczo6Y29uc3RydWN0Cisg ICAgICAgICAgICB9OworICAgICAgICAgICAgCisgICAgICAgICAgICByZXR1cm4gJm5wQ2xhc3M7 CisgICAgICAgIH07CisKKyAgICAgICAgUGx1Z2luVGVzdCogbV9wbHVnaW5UZXN0OworICAgIH07 CisgICAgCiBwcml2YXRlOgogICAgIHR5cGVkZWYgUGx1Z2luVGVzdCogKCpDcmVhdGVUZXN0RnVu Y3Rpb24pKE5QUCwgY29uc3Qgc3RkOjpzdHJpbmcmKTsKICAgICAKZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2FwZVBsdWdJbi9UZXN0cy9Eb2N1bWVudE9w ZW5JbkRlc3Ryb3lTdHJlYW0uY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5l dHNjYXBlUGx1Z0luL1Rlc3RzL0RvY3VtZW50T3BlbkluRGVzdHJveVN0cmVhbS5jcHAKaW5kZXgg MTBmZjI2MzNhNTE4NDFkMmQ2OGUxMGVkYzYwZTcxMjRjZmE4ZDZhOS4uNjllNzA2ZWE0MmI4NDIz NjhlNjhjMjc2OGIxZGQwZTVlNTE4ZjhhMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL0RvY3VtZW50T3BlbkluRGVzdHJveVN0 cmVhbS5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1 Z0luL1Rlc3RzL0RvY3VtZW50T3BlbkluRGVzdHJveVN0cmVhbS5jcHAKQEAgLTQwLDE5ICs0MCwx NyBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRlOgotICAgIHZpcnR1YWwgTlBFcnJvciBOUFBf RGVzdHJveVN0cmVhbShOUFN0cmVhbSosIE5QUmVhc29uKTsKKyAgICB2aXJ0dWFsIE5QRXJyb3Ig TlBQX0Rlc3Ryb3lTdHJlYW0oTlBTdHJlYW0qLCBOUFJlYXNvbikKKyAgICB7CisgICAgICAgIGlm IChtX3Nob3VsZE9wZW4pIHsKKyAgICAgICAgICAgIHRlc3REb2N1bWVudE9wZW4obV9ucHApOwor ICAgICAgICAgICAgbV9zaG91bGRPcGVuID0gZmFsc2U7CisgICAgICAgIH0KKyAgICAgICAgCisg ICAgICAgIHJldHVybiBOUEVSUl9OT19FUlJPUjsKKyAgICB9ICAgICAgICAKIAogICAgIGJvb2wg bV9zaG91bGRPcGVuOwogfTsKIAotTlBFcnJvciBEb2N1bWVudE9wZW5JbkRlc3Ryb3lTdHJlYW06 Ok5QUF9EZXN0cm95U3RyZWFtKE5QU3RyZWFtKiwgTlBSZWFzb24pCi17Ci0gICAgaWYgKG1fc2hv dWxkT3BlbikgewotICAgICAgICB0ZXN0RG9jdW1lbnRPcGVuKG1fbnBwKTsKLSAgICAgICAgbV9z aG91bGRPcGVuID0gZmFsc2U7Ci0gICAgfQotICAgIAotICAgIHJldHVybiBOUEVSUl9OT19FUlJP UjsKLX0KLQogc3RhdGljIFBsdWdpblRlc3Q6OlJlZ2lzdGVyPERvY3VtZW50T3BlbkluRGVzdHJv eVN0cmVhbT4gZG9jdW1lbnRPcGVuSW5EZXN0cm95U3RyZWFtKCJkb2N1bWVudC1vcGVuLWluLWRl c3Ryb3ktc3RyZWFtIik7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9U ZXN0TmV0c2NhcGVQbHVnSW4vVGVzdHMvUGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0SW52b2tlRGVm YXVsdC5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4v VGVzdHMvUGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0SW52b2tlRGVmYXVsdC5jcHAKaW5kZXggMzBj NDYzYjdiNTk4ZGM1YjQ0MWUxOWNkNWZjMzQxZWJkNmVmNzA4ZS4uOTU5ZTE4MmU0NjNmNjEyZjY5 NTlmZThiMmJlY2NjMGExMzI3ODViMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luL1Rlc3RzL1BsdWdpblNjcmlwdGFibGVOUE9iamVjdElu dm9rZURlZmF1bHQuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL1Rlc3ROZXRz Y2FwZVBsdWdJbi9UZXN0cy9QbHVnaW5TY3JpcHRhYmxlTlBPYmplY3RJbnZva2VEZWZhdWx0LmNw cApAQCAtMjcsNDQgKzI3LDYgQEAKIAogdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAotc3RhdGljIGJv b2wgaW52b2tlRGVmYXVsdChOUE9iamVjdCosIGNvbnN0IE5QVmFyaWFudCosIHVpbnQzMl90LCBO UFZhcmlhbnQqIHJlc3VsdCkKLXsKLSAgICBJTlQzMl9UT19OUFZBUklBTlQoMSwgKnJlc3VsdCk7 Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLXN0YXRpYyBOUENsYXNzIG5wQ2xhc3NXaXRoSW52b2tl RGVmYXVsdCA9IHsgCi0gICAgTlBfQ0xBU1NfU1RSVUNUX1ZFUlNJT04sIAotICAgIDAsIC8vIE5Q Q2xhc3M6OmFsbG9jYXRlCi0gICAgMCwgLy8gTlBDbGFzczo6ZGVhbGxvY2F0ZQotICAgIDAsIC8v IE5QQ2xhc3M6OmludmFsaWRhdGUKLSAgICAwLCAvLyBOUENsYXNzOjpoYXNNZXRob2QKLSAgICAw LCAvLyBOUENsYXNzOjppbnZva2UKLSAgICBpbnZva2VEZWZhdWx0LAotICAgIDAsIC8vIE5QQ2xh c3M6Omhhc1Byb3BlcnR5Ci0gICAgMCwgLy8gTlBDbGFzczo6Z2V0UHJvcGVydHkKLSAgICAwLCAv LyBOUENsYXNzOjpzZXRQcm9wZXJ0eQotICAgIDAsIC8vIE5QQ2xhc3M6OnJlbW92ZVByb3BlcnR5 Ci0gICAgMCwgLy8gTlBDbGFzczo6ZW51bWVyYXRlCi0gICAgMCAgLy8gTlBDbGFzczo6Y29uc3Ry dWN0Ci19OwotCi1zdGF0aWMgTlBDbGFzcyBucENsYXNzV2l0aG91dEludm9rZURlZmF1bHQgPSB7 IAotICAgIE5QX0NMQVNTX1NUUlVDVF9WRVJTSU9OLCAKLSAgICAwLCAvLyBOUENsYXNzOjphbGxv Y2F0ZQotICAgIDAsIC8vIE5QQ2xhc3M6OmRlYWxsb2NhdGUKLSAgICAwLCAvLyBOUENsYXNzOjpp bnZhbGlkYXRlCi0gICAgMCwgLy8gTlBDbGFzczo6aGFzTWV0aG9kCi0gICAgMCwgLy8gTlBDbGFz czo6aW52b2tlCi0gICAgMCwgLy8gTlBDbGFzczo6aW52b2tlRGVmYXVsdCwKLSAgICAwLCAvLyBO UENsYXNzOjpoYXNQcm9wZXJ0eQotICAgIDAsIC8vIE5QQ2xhc3M6OmdldFByb3BlcnR5Ci0gICAg MCwgLy8gTlBDbGFzczo6c2V0UHJvcGVydHkKLSAgICAwLCAvLyBOUENsYXNzOjpyZW1vdmVQcm9w ZXJ0eQotICAgIDAsIC8vIE5QQ2xhc3M6OmVudW1lcmF0ZQotICAgIDAgIC8vIE5QQ2xhc3M6OmNv bnN0cnVjdAotfTsKLQogLy8gQSB0ZXN0IHdoZXJlIHRoZSBwbHVnLWlucyBzY3JpcHRhYmxlIG9i amVjdCBlaXRoZXIgaGFzIG9yIGRvZXNuJ3QgaGF2ZSBhbiBpbnZva2VEZWZhdWx0IGZ1bmN0aW9u LgogY2xhc3MgUGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0SW52b2tlRGVmYXVsdCA6IHB1YmxpYyBQ bHVnaW5UZXN0IHsKIHB1YmxpYzoKQEAgLTc0LDIzICszNiwzMiBAQCBwdWJsaWM6CiAgICAgfQog CiBwcml2YXRlOgorICAgIHN0cnVjdCBOUE9iamVjdFdpdGhvdXRJbnZva2VEZWZhdWx0IDogT2Jq ZWN0PE5QT2JqZWN0V2l0aG91dEludm9rZURlZmF1bHQ+IHsgfTsKKworICAgIHN0cnVjdCBOUE9i amVjdFdpdGhJbnZva2VEZWZhdWx0IDogT2JqZWN0PE5QT2JqZWN0V2l0aEludm9rZURlZmF1bHQ+ IHsgCisgICAgcHVibGljOgorICAgICAgICBib29sIGludm9rZURlZmF1bHQoY29uc3QgTlBWYXJp YW50KiwgdWludDMyX3QsIE5QVmFyaWFudCogcmVzdWx0KQorICAgICAgICB7CisgICAgICAgICAg ICBJTlQzMl9UT19OUFZBUklBTlQoMSwgKnJlc3VsdCk7CisgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICAgICAgfQorICAgIH07CisKICAgICB2aXJ0dWFsIE5QRXJyb3IgTlBQX0dldFZhbHVl KE5QUFZhcmlhYmxlIHZhcmlhYmxlLCB2b2lkICp2YWx1ZSkKICAgICB7CiAgICAgICAgIGlmICh2 YXJpYWJsZSAhPSBOUFBWcGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0KQogICAgICAgICAgICAgcmV0 dXJuIE5QRVJSX0dFTkVSSUNfRVJST1I7CiAKLSAgICAgICAgTlBDbGFzcyogbnBDbGFzczsKKyAg ICAgICAgTlBPYmplY3QqIG9iamVjdDsKICAgICAgICAgaWYgKGlkZW50aWZpZXIoKSA9PSAicGx1 Z2luLXNjcmlwdGFibGUtbnBvYmplY3QtaW52b2tlLWRlZmF1bHQiKQotICAgICAgICAgICAgbnBD bGFzcyA9ICZucENsYXNzV2l0aEludm9rZURlZmF1bHQ7CisgICAgICAgICAgICBvYmplY3QgPSBO UE9iamVjdFdpdGhJbnZva2VEZWZhdWx0OjpjcmVhdGUodGhpcyk7CiAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgIG5wQ2xhc3MgPSAmbnBDbGFzc1dpdGhvdXRJbnZva2VEZWZhdWx0OworICAgICAg ICAgICAgb2JqZWN0ID0gTlBPYmplY3RXaXRob3V0SW52b2tlRGVmYXVsdDo6Y3JlYXRlKHRoaXMp OwogICAgICAgICAKLSAgICAgICAgKihOUE9iamVjdCoqKXZhbHVlID0gTlBOX0NyZWF0ZU9iamVj dChucENsYXNzKTsKKyAgICAgICAgKihOUE9iamVjdCoqKXZhbHVlID0gb2JqZWN0OwogICAgICAg ICAKICAgICAgICAgcmV0dXJuIE5QRVJSX05PX0VSUk9SOwogICAgIH0KLQotICAgIE5QT2JqZWN0 KiBtX3NjcmlwdGFibGVPYmplY3Q7CiB9OwogCiBzdGF0aWMgUGx1Z2luVGVzdDo6UmVnaXN0ZXI8 UGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0SW52b2tlRGVmYXVsdD4gcGx1Z2luU2NyaXB0YWJsZU5Q T2JqZWN0SW52b2tlRGVmYXVsdCgicGx1Z2luLXNjcmlwdGFibGUtbnBvYmplY3QtaW52b2tlLWRl ZmF1bHQiKTsK