43370 2010-08-02 12:15:54 -0700 Protect the plug-in from being destroyed while in plug-in code 2010-08-02 13:03:09 -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 259036 0 andersca 2010-08-02 12:15:54 -0700 Protect the plug-in from being destroyed while in plug-in code 259038 1 63246 andersca 2010-08-02 12:18:44 -0700 Created attachment 63246 Patch 259061 2 andersca 2010-08-02 13:03:09 -0700 Committed r64487: <http://trac.webkit.org/changeset/64487> 63246 2010-08-02 12:18:44 -0700 2010-08-02 12:35:35 -0700 Patch bug-43370-20100802121842.patch text/plain 13158 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YjMyOGMyNDcyNmRhNjA2MjY3YTAwODdkODU5NTBkMmEzZDFmMDI2OS4uMTczNzFlMTNlZDNkNDEz YjhlMmE5ZGY5OTU0ZWFiN2JkMjA4NjZkZSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0NiBAQAogMjAxMC0wOC0wMiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3RlY3QgdGhlIHBsdWctaW4gZnJvbSBiZWlu ZyBkZXN0cm95ZWQgd2hpbGUgaW4gcGx1Zy1pbiBjb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzM3MAorCisgICAgICAgIEFkZCBhIFBsdWdpblBy b3RlY3RvciB0byBOUFJ1bnRpbWVPYmplY3RNYXAgYW5kIHVzZSBpdCBpbiBKU05QT2JqZWN0Lgor ICAgICAgICAKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvSlNOUE9iamVjdC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkpTTlBPYmplY3Q6OmNhbGxNZXRob2QpOgorICAgICAgICAoV2ViS2l0 OjpKU05QT2JqZWN0OjpjYWxsT2JqZWN0KToKKyAgICAgICAgKFdlYktpdDo6SlNOUE9iamVjdDo6 Y2FsbENvbnN0cnVjdG9yKToKKyAgICAgICAgKFdlYktpdDo6SlNOUE9iamVjdDo6cHV0KToKKyAg ICAgICAgKFdlYktpdDo6SlNOUE9iamVjdDo6Z2V0T3duUHJvcGVydHlOYW1lcyk6CisgICAgICAg IChXZWJLaXQ6OkpTTlBPYmplY3Q6OnByb3BlcnR5R2V0dGVyKToKKyAgICAgICAgQWRkIFBsdWdp blByb3RlY3RvciBkZWNsYXJhdGlvbnMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMv TlBSdW50aW1lT2JqZWN0TWFwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TlBSdW50aW1lT2JqZWN0 TWFwOjpQbHVnaW5Qcm90ZWN0b3I6OlBsdWdpblByb3RlY3Rvcik6CisgICAgICAgIFJlZiB0aGUg cGx1Zy1pbiB2aWV3ICh1bmxlc3MgaXQncyBiZWluZyBkZXN0cm95ZWQpLgorCisgICAgICAgIChX ZWJLaXQ6Ok5QUnVudGltZU9iamVjdE1hcDo6UGx1Z2luUHJvdGVjdG9yOjp+UGx1Z2luUHJvdGVj dG9yKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTlBSdW50aW1lT2JqZWN0TWFwLmg6 CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHA6CisgICAgICAg IChXZWJLaXQ6OlBsdWdpblZpZXc6OlBsdWdpblZpZXcpOgorICAgICAgICBJbml0aWFsaXplIG1f aXNCZWluZ0Rlc3Ryb3llZC4KKworICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3Ojp+UGx1Z2lu Vmlldyk6CisgICAgICAgIFNldCBtX2lzQmVpbmdEZXN0cm95ZWQgdG8gdHJ1ZS4KKworICAgICAg ICAoV2ViS2l0OjpQbHVnaW5WaWV3OjpzY3JpcHRPYmplY3QpOgorICAgICAgICBEb24ndCBjcmFz aCBpZiB0aGUgcGx1Zy1pbiBmYWlsZWQgdG8gaW5pdGlhbGl6ZS4KKworICAgICAgICAoV2ViS2l0 OjpQbHVnaW5WaWV3OjpldmFsdWF0ZSk6CisgICAgICAgIFJlbW92ZSBjb21tZW50LgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaDoKKyAgICAgICAgKFdlYktpdDo6 UGx1Z2luVmlldzo6aXNCZWluZ0Rlc3Ryb3llZCk6CisKKzIwMTAtMDgtMDIgIEFuZGVycyBDYXJs c3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2Vp bmlnLgogCiAgICAgICAgIENhY2hlIEpTTlBPYmplY3RzIGFuZCBmaXggYnVncyBpbiB0aGUgb2Jq ZWN0IG1hcApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvSlNOUE9iamVj dC5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9KU05QT2JqZWN0LmNwcAppbmRleCBl MTNlOTIwODkzNmI4NDQ5NWIwMjg2NTFmZTE3ZjI2MzM1MTM1YjJjLi5iZDg5YjJlNGQwZjk2N2U3 MWZlMGEyNDM1NDRlOTZiNDYzZWY4ZDI0IDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9KU05QT2JqZWN0LmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9K U05QT2JqZWN0LmNwcApAQCAtODgsNiArODgsMTEgQEAgSlNWYWx1ZSBKU05QT2JqZWN0OjpjYWxs TWV0aG9kKEV4ZWNTdGF0ZSogZXhlYywgTlBJZGVudGlmaWVyIG1ldGhvZE5hbWUpCiAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBhcmd1bWVudENvdW50OyArK2kpCiAgICAgICAgIG1fb2JqZWN0 TWFwLT5jb252ZXJ0SlNWYWx1ZVRvTlBWYXJpYW50KGV4ZWMsIGV4ZWMtPmFyZ3VtZW50KGkpLCBh cmd1bWVudHNbaV0pOwogCisgICAgLy8gQ2FsbGluZyBOUENsYXNzOjppbnZva2Ugd2lsbCBjYWxs IGludG8gcGx1Zy1pbiBjb2RlLCBhbmQgdGhlcmUncyBubyB0ZWxsaW5nIHdoYXQgdGhlIHBsdWct aW4gY2FuIGRvLgorICAgIC8vIChpbmNsdWRpbmcgZGVzdHJveWluZyB0aGUgcGx1Zy1pbikuIEJl Y2F1c2Ugb2YgdGhpcywgd2UgbWFrZSBzdXJlIHRvIGtlZXAgdGhlIHBsdWctaW4gYWxpdmUgdW50 aWwgCisgICAgLy8gdGhlIGNhbGwgaGFzIGZpbmlzaGVkLgorICAgIE5QUnVudGltZU9iamVjdE1h cDo6UGx1Z2luUHJvdGVjdG9yIHByb3RlY3RvcihtX29iamVjdE1hcCk7CisKICAgICBib29sIHJl dHVyblZhbHVlOwogICAgIE5QVmFyaWFudCByZXN1bHQ7CiAgICAgVk9JRF9UT19OUFZBUklBTlQo cmVzdWx0KTsKQEAgLTk1LDkgKzEwMCw3IEBAIEpTVmFsdWUgSlNOUE9iamVjdDo6Y2FsbE1ldGhv ZChFeGVjU3RhdGUqIGV4ZWMsIE5QSWRlbnRpZmllciBtZXRob2ROYW1lKQogICAgIHsKICAgICAg ICAgSlNMb2NrOjpEcm9wQWxsTG9ja3MgZHJvcEFsbExvY2tzKFNpbGVuY2VBc3NlcnRpb25zT25s eSk7CiAgICAgICAgIHJldHVyblZhbHVlID0gbV9ucE9iamVjdC0+X2NsYXNzLT5pbnZva2UobV9u cE9iamVjdCwgbWV0aG9kTmFtZSwgYXJndW1lbnRzLmRhdGEoKSwgYXJndW1lbnRDb3VudCwgJnJl c3VsdCk7Ci0KLSAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBpbnZva2Ugc2V0dGluZyBhbiBleGNl cHRpb24uCi0gICAgICAgIC8vIEZJWE1FOiBGaW5kIG91dCB3aGF0IGhhcHBlbnMgaWYgY2FsbGlu ZyBpbnZva2UgY2F1c2VzIHRoZSBwbHVnLWluIHRvIGdvIGF3YXkuCisgICAgICAgIE5QUnVudGlt ZU9iamVjdE1hcDo6bW92ZUdsb2JhbEV4Y2VwdGlvblRvRXhlY1N0YXRlKGV4ZWMpOwogICAgIH0K IAogICAgIC8vIFJlbGVhc2UgYWxsIGFyZ3VtZW50czsKQEAgLTEyMyw2ICsxMjYsMTEgQEAgSlND OjpKU1ZhbHVlIEpTTlBPYmplY3Q6OmNhbGxPYmplY3QoSlNDOjpFeGVjU3RhdGUqIGV4ZWMpCiAg ICAgLy8gQ29udmVydCBhbGwgYXJndW1lbnRzIHRvIE5QVmFyaWFudHMuCiAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBhcmd1bWVudENvdW50OyArK2kpCiAgICAgICAgIG1fb2JqZWN0TWFwLT5j b252ZXJ0SlNWYWx1ZVRvTlBWYXJpYW50KGV4ZWMsIGV4ZWMtPmFyZ3VtZW50KGkpLCBhcmd1bWVu dHNbaV0pOworCisgICAgLy8gQ2FsbGluZyBOUENsYXNzOjppbnZva2VEZWZhdWx0IHdpbGwgY2Fs bCBpbnRvIHBsdWctaW4gY29kZSwgYW5kIHRoZXJlJ3Mgbm8gdGVsbGluZyB3aGF0IHRoZSBwbHVn LWluIGNhbiBkby4KKyAgICAvLyAoaW5jbHVkaW5nIGRlc3Ryb3lpbmcgdGhlIHBsdWctaW4pLiBC ZWNhdXNlIG9mIHRoaXMsIHdlIG1ha2Ugc3VyZSB0byBrZWVwIHRoZSBwbHVnLWluIGFsaXZlIHVu dGlsIAorICAgIC8vIHRoZSBjYWxsIGhhcyBmaW5pc2hlZC4KKyAgICBOUFJ1bnRpbWVPYmplY3RN YXA6OlBsdWdpblByb3RlY3RvciBwcm90ZWN0b3IobV9vYmplY3RNYXApOwogICAgIAogICAgIGJv b2wgcmV0dXJuVmFsdWU7CiAgICAgTlBWYXJpYW50IHJlc3VsdDsKQEAgLTEzMSw5ICsxMzksNyBA QCBKU0M6OkpTVmFsdWUgSlNOUE9iamVjdDo6Y2FsbE9iamVjdChKU0M6OkV4ZWNTdGF0ZSogZXhl YykKICAgICB7CiAgICAgICAgIEpTTG9jazo6RHJvcEFsbExvY2tzIGRyb3BBbGxMb2NrcyhTaWxl bmNlQXNzZXJ0aW9uc09ubHkpOwogICAgICAgICByZXR1cm5WYWx1ZSA9IG1fbnBPYmplY3QtPl9j bGFzcy0+aW52b2tlRGVmYXVsdChtX25wT2JqZWN0LCBhcmd1bWVudHMuZGF0YSgpLCBhcmd1bWVu dENvdW50LCAmcmVzdWx0KTsKLSAgICAgICAgCi0gICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgaW52 b2tlRGVmYXVsdCBzZXR0aW5nIGFuIGV4Y2VwdGlvbi4KLSAgICAgICAgLy8gRklYTUU6IEZpbmQg b3V0IHdoYXQgaGFwcGVucyBpZiBjYWxsaW5nIGludm9rZURlZmF1bHQgY2F1c2VzIHRoZSBwbHVn LWluIHRvIGdvIGF3YXkuCisgICAgICAgIE5QUnVudGltZU9iamVjdE1hcDo6bW92ZUdsb2JhbEV4 Y2VwdGlvblRvRXhlY1N0YXRlKGV4ZWMpOwogICAgIH0KIAogICAgIC8vIFJlbGVhc2UgYWxsIGFy Z3VtZW50czsKQEAgLTE2MCw2ICsxNjYsMTEgQEAgSlNWYWx1ZSBKU05QT2JqZWN0OjpjYWxsQ29u c3RydWN0b3IoRXhlY1N0YXRlKiBleGVjKQogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYXJn dW1lbnRDb3VudDsgKytpKQogICAgICAgICBtX29iamVjdE1hcC0+Y29udmVydEpTVmFsdWVUb05Q VmFyaWFudChleGVjLCBleGVjLT5hcmd1bWVudChpKSwgYXJndW1lbnRzW2ldKTsKIAorICAgIC8v IENhbGxpbmcgTlBDbGFzczo6Y29uc3RydWN0IHdpbGwgY2FsbCBpbnRvIHBsdWctaW4gY29kZSwg YW5kIHRoZXJlJ3Mgbm8gdGVsbGluZyB3aGF0IHRoZSBwbHVnLWluIGNhbiBkby4KKyAgICAvLyAo aW5jbHVkaW5nIGRlc3Ryb3lpbmcgdGhlIHBsdWctaW4pLiBCZWNhdXNlIG9mIHRoaXMsIHdlIG1h a2Ugc3VyZSB0byBrZWVwIHRoZSBwbHVnLWluIGFsaXZlIHVudGlsIAorICAgIC8vIHRoZSBjYWxs IGhhcyBmaW5pc2hlZC4KKyAgICBOUFJ1bnRpbWVPYmplY3RNYXA6OlBsdWdpblByb3RlY3RvciBw cm90ZWN0b3IobV9vYmplY3RNYXApOworICAgIAogICAgIGJvb2wgcmV0dXJuVmFsdWU7CiAgICAg TlBWYXJpYW50IHJlc3VsdDsKICAgICBWT0lEX1RPX05QVkFSSUFOVChyZXN1bHQpOwpAQCAtMTY4 LDggKzE3OSw2IEBAIEpTVmFsdWUgSlNOUE9iamVjdDo6Y2FsbENvbnN0cnVjdG9yKEV4ZWNTdGF0 ZSogZXhlYykKICAgICAgICAgSlNMb2NrOjpEcm9wQWxsTG9ja3MgZHJvcEFsbExvY2tzKFNpbGVu Y2VBc3NlcnRpb25zT25seSk7CiAgICAgICAgIHJldHVyblZhbHVlID0gbV9ucE9iamVjdC0+X2Ns YXNzLT5jb25zdHJ1Y3QobV9ucE9iamVjdCwgYXJndW1lbnRzLmRhdGEoKSwgYXJndW1lbnRDb3Vu dCwgJnJlc3VsdCk7CiAgICAgICAgIE5QUnVudGltZU9iamVjdE1hcDo6bW92ZUdsb2JhbEV4Y2Vw dGlvblRvRXhlY1N0YXRlKGV4ZWMpOwotICAgICAgICAKLSAgICAgICAgLy8gRklYTUU6IEZpbmQg b3V0IHdoYXQgaGFwcGVucyBpZiBjYWxsaW5nIGNvbnN0cnVjdCBjYXVzZXMgdGhlIHBsdWctaW4g dG8gZ28gYXdheS4KICAgICB9CiAKICAgICBpZiAoIXJldHVyblZhbHVlKQpAQCAtMjg1LDEzICsy OTQsMTggQEAgdm9pZCBKU05QT2JqZWN0OjpwdXQoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJZGVu dGlmaWVyJiBwcm9wZXJ0eU5hbWUsIEpTVmFsdWUgdmEKIAogICAgIE5QVmFyaWFudCB2YXJpYW50 OwogICAgIG1fb2JqZWN0TWFwLT5jb252ZXJ0SlNWYWx1ZVRvTlBWYXJpYW50KGV4ZWMsIHZhbHVl LCB2YXJpYW50KTsKKworICAgIC8vIENhbGxpbmcgTlBDbGFzczo6c2V0UHJvcGVydHkgd2lsbCBj YWxsIGludG8gcGx1Zy1pbiBjb2RlLCBhbmQgdGhlcmUncyBubyB0ZWxsaW5nIHdoYXQgdGhlIHBs dWctaW4gY2FuIGRvLgorICAgIC8vIChpbmNsdWRpbmcgZGVzdHJveWluZyB0aGUgcGx1Zy1pbiku IEJlY2F1c2Ugb2YgdGhpcywgd2UgbWFrZSBzdXJlIHRvIGtlZXAgdGhlIHBsdWctaW4gYWxpdmUg dW50aWwgCisgICAgLy8gdGhlIGNhbGwgaGFzIGZpbmlzaGVkLgorICAgIE5QUnVudGltZU9iamVj dE1hcDo6UGx1Z2luUHJvdGVjdG9yIHByb3RlY3RvcihtX29iamVjdE1hcCk7CisKICAgICB7CiAg ICAgICAgIEpTTG9jazo6RHJvcEFsbExvY2tzIGRyb3BBbGxMb2NrcyhTaWxlbmNlQXNzZXJ0aW9u c09ubHkpOwogICAgICAgICBtX25wT2JqZWN0LT5fY2xhc3MtPnNldFByb3BlcnR5KG1fbnBPYmpl Y3QsIG5wSWRlbnRpZmllciwgJnZhcmlhbnQpOwogCiAgICAgICAgIE5QUnVudGltZU9iamVjdE1h cDo6bW92ZUdsb2JhbEV4Y2VwdGlvblRvRXhlY1N0YXRlKGV4ZWMpOwogCi0gICAgICAgIC8vIEZJ WE1FOiBGaW5kIG91dCB3aGF0IGhhcHBlbnMgaWYgY2FsbGluZyBzZXRQcm9wZXJ0eSBjYXVzZXMg dGhlIHBsdWctaW4gdG8gZ28gYXdheS4KICAgICAgICAgLy8gRklYTUU6IFNob3VsZCB3ZSB0aHJv dyBhbiBleGNlcHRpb24gaWYgc2V0UHJvcGVydHkgcmV0dXJucyBmYWxzZT8KICAgICB9CiAKQEAg LTMxMSwxMCArMzI1LDE0IEBAIHZvaWQgSlNOUE9iamVjdDo6Z2V0T3duUHJvcGVydHlOYW1lcyhF eGVjU3RhdGUqIGV4ZWMsIFByb3BlcnR5TmFtZUFycmF5JiBwcm9wZXJ0CiAgICAgTlBJZGVudGlm aWVyKiBpZGVudGlmaWVycyA9IDA7CiAgICAgdWludDMyX3QgaWRlbnRpZmllckNvdW50ID0gMDsK ICAgICAKKyAgICAvLyBDYWxsaW5nIE5QQ2xhc3M6OmVudW1lcmF0ZSB3aWxsIGNhbGwgaW50byBw bHVnLWluIGNvZGUsIGFuZCB0aGVyZSdzIG5vIHRlbGxpbmcgd2hhdCB0aGUgcGx1Zy1pbiBjYW4g ZG8uCisgICAgLy8gKGluY2x1ZGluZyBkZXN0cm95aW5nIHRoZSBwbHVnLWluKS4gQmVjYXVzZSBv ZiB0aGlzLCB3ZSBtYWtlIHN1cmUgdG8ga2VlcCB0aGUgcGx1Zy1pbiBhbGl2ZSB1bnRpbCAKKyAg ICAvLyB0aGUgY2FsbCBoYXMgZmluaXNoZWQuCisgICAgTlBSdW50aW1lT2JqZWN0TWFwOjpQbHVn aW5Qcm90ZWN0b3IgcHJvdGVjdG9yKG1fb2JqZWN0TWFwKTsKKyAgICAKICAgICB7CiAgICAgICAg IEpTTG9jazo6RHJvcEFsbExvY2tzIGRyb3BBbGxMb2NrcyhTaWxlbmNlQXNzZXJ0aW9uc09ubHkp OwogCi0gICAgICAgIC8vIEZJWE1FOiBGaW5kIG91dCB3aGF0IGhhcHBlbnMgaWYgY2FsbGluZyBl bnVtZXJhdGUgY2F1c2VzIHRoZSBwbHVnLWluIHRvIGdvIGF3YXkuCiAgICAgICAgIC8vIEZJWE1F OiBTaG91bGQgd2UgdGhyb3cgYW4gZXhjZXB0aW9uIGlmIGVudW1lcmF0ZSByZXR1cm5zIGZhbHNl PwogICAgICAgICBpZiAoIW1fbnBPYmplY3QtPl9jbGFzcy0+ZW51bWVyYXRlKG1fbnBPYmplY3Qs ICZpZGVudGlmaWVycywgJmlkZW50aWZpZXJDb3VudCkpCiAgICAgICAgICAgICByZXR1cm47CkBA IC0zNTQsNiArMzcyLDExIEBAIEpTVmFsdWUgSlNOUE9iamVjdDo6cHJvcGVydHlHZXR0ZXIoRXhl Y1N0YXRlKiBleGVjLCBKU1ZhbHVlIHNsb3RCYXNlLCBjb25zdCBJZGVuCiAgICAgTlBWYXJpYW50 IHJlc3VsdDsKICAgICBWT0lEX1RPX05QVkFSSUFOVChyZXN1bHQpOwogCisgICAgLy8gQ2FsbGlu ZyBOUENsYXNzOjpnZXRQcm9wZXJ0eSB3aWxsIGNhbGwgaW50byBwbHVnLWluIGNvZGUsIGFuZCB0 aGVyZSdzIG5vIHRlbGxpbmcgd2hhdCB0aGUgcGx1Zy1pbiBjYW4gZG8uCisgICAgLy8gKGluY2x1 ZGluZyBkZXN0cm95aW5nIHRoZSBwbHVnLWluKS4gQmVjYXVzZSBvZiB0aGlzLCB3ZSBtYWtlIHN1 cmUgdG8ga2VlcCB0aGUgcGx1Zy1pbiBhbGl2ZSB1bnRpbCAKKyAgICAvLyB0aGUgY2FsbCBoYXMg ZmluaXNoZWQuCisgICAgTlBSdW50aW1lT2JqZWN0TWFwOjpQbHVnaW5Qcm90ZWN0b3IgcHJvdGVj dG9yKHRoaXNPYmotPm1fb2JqZWN0TWFwKTsKKyAgICAKICAgICBib29sIHJldHVyblZhbHVlOwog ICAgIHsKICAgICAgICAgSlNMb2NrOjpEcm9wQWxsTG9ja3MgZHJvcEFsbExvY2tzKFNpbGVuY2VB c3NlcnRpb25zT25seSk7CkBAIC0zNjEsOCArMzg0LDYgQEAgSlNWYWx1ZSBKU05QT2JqZWN0Ojpw cm9wZXJ0eUdldHRlcihFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgc2xvdEJhc2UsIGNvbnN0IElk ZW4KICAgICAgICAgcmV0dXJuVmFsdWUgPSB0aGlzT2JqLT5tX25wT2JqZWN0LT5fY2xhc3MtPmdl dFByb3BlcnR5KHRoaXNPYmotPm1fbnBPYmplY3QsIG5wSWRlbnRpZmllciwgJnJlc3VsdCk7CiAg ICAgICAgIAogICAgICAgICBOUFJ1bnRpbWVPYmplY3RNYXA6Om1vdmVHbG9iYWxFeGNlcHRpb25U b0V4ZWNTdGF0ZShleGVjKTsKLQotICAgICAgICAvLyBGSVhNRTogRmluZCBvdXQgd2hhdCBoYXBw ZW5zIGlmIGNhbGxpbmcgZ2V0UHJvcGVydHkgY2F1c2VzIHRoZSBwbHVnLWluIHRvIGdvIGF3YXku CiAgICAgfQogCiAgICAgaWYgKCFyZXR1cm5WYWx1ZSkKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZU9iamVjdE1hcC5jcHAgYi9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OUFJ1bnRpbWVPYmplY3RNYXAuY3BwCmluZGV4IGJjNjFiNDRmM2E3YTUwZmQ0 MzU4YzlmNGM5ODQ4NWU5YjI3YjA5Y2YuLmJjMDkzMzNjZjA0N2FmMDgzNThhYjIwNWFkYTczYTlm ODIzMmQyYTIgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGlt ZU9iamVjdE1hcC5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTlBSdW50aW1l T2JqZWN0TWFwLmNwcApAQCAtNDYsNiArNDYsMTcgQEAgTlBSdW50aW1lT2JqZWN0TWFwOjpOUFJ1 bnRpbWVPYmplY3RNYXAoUGx1Z2luVmlldyogcGx1Z2luVmlldykKIHsKIH0KIAorTlBSdW50aW1l T2JqZWN0TWFwOjpQbHVnaW5Qcm90ZWN0b3I6OlBsdWdpblByb3RlY3RvcihOUFJ1bnRpbWVPYmpl Y3RNYXAqIG5wUnVudGltZU9iamVjdE1hcCkKK3sKKyAgICAvLyBJZiB3ZSdyZSBhbHJlYWR5IGlu IHRoZSBwbHVnLWluIHZpZXcgZGVzdHJ1Y3Rvciwgd2Ugc2hvdWxkbid0IHRyeSB0byBrZWVwIGl0 IGFsaXZlLgorICAgIGlmICghbnBSdW50aW1lT2JqZWN0TWFwLT5tX3BsdWdpblZpZXctPmlzQmVp bmdEZXN0cm95ZWQoKSkKKyAgICAgICAgbV9wbHVnaW5WaWV3ID0gbnBSdW50aW1lT2JqZWN0TWFw LT5tX3BsdWdpblZpZXc7Cit9CisKK05QUnVudGltZU9iamVjdE1hcDo6UGx1Z2luUHJvdGVjdG9y Ojp+UGx1Z2luUHJvdGVjdG9yKCkKK3sKK30KKwogTlBPYmplY3QqIE5QUnVudGltZU9iamVjdE1h cDo6Z2V0T3JDcmVhdGVOUE9iamVjdChKU09iamVjdCoganNPYmplY3QpCiB7CiAgICAgLy8gSWYg dGhpcyBpcyBhIEpTTlBPYmplY3QsIHdlIGNhbiBqdXN0IGdldCBpdHMgdW5kZXJseWluZyBOUE9i amVjdC4KZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZU9i amVjdE1hcC5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTlBSdW50aW1lT2JqZWN0TWFw LmgKaW5kZXggNTFiZDBjNjI4MWZlODk1MGI4MDk5MjNiOTQzOWMwMDA1NTI2YzliYi4uMmI4ZTQ5 ZjIwNTU2YjQ0Yjg0MmQyNzllNDExMTNiZTY5ZGViNTdhMSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvTlBSdW50aW1lT2JqZWN0TWFwLmgKKysrIGIvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvTlBSdW50aW1lT2JqZWN0TWFwLmgKQEAgLTUzLDYgKzUzLDE1IEBAIGNs YXNzIE5QUnVudGltZU9iamVjdE1hcCB7CiBwdWJsaWM6CiAgICAgZXhwbGljaXQgTlBSdW50aW1l T2JqZWN0TWFwKFBsdWdpblZpZXcqKTsKIAorICAgIGNsYXNzIFBsdWdpblByb3RlY3RvciB7Cisg ICAgcHVibGljOgorICAgICAgICBleHBsaWNpdCBQbHVnaW5Qcm90ZWN0b3IoTlBSdW50aW1lT2Jq ZWN0TWFwKiBucFJ1bnRpbWVPYmplY3RNYXApOworICAgICAgICB+UGx1Z2luUHJvdGVjdG9yKCk7 CisgICAgICAgIAorICAgIHByaXZhdGU6CisgICAgICAgIFJlZlB0cjxQbHVnaW5WaWV3PiBtX3Bs dWdpblZpZXc7CisgICAgfTsKKwogICAgIC8vIFJldHVybnMgYW4gTlBPYmplY3QgdGhhdCB3cmFw cyB0aGUgZ2l2ZW4gSlNPYmplY3Qgb2JqZWN0LiBJZiB0aGVyZSBpcyBhbHJlYWR5IGFuIE5QT2Jq ZWN0IHRoYXQgd3JhcHMgdGhpcyBKU09iamVjdCwgaXQgd2lsbAogICAgIC8vIHJldGFpbiBpdCBh bmQgcmV0dXJuIGl0LgogICAgIE5QT2JqZWN0KiBnZXRPckNyZWF0ZU5QT2JqZWN0KEpTQzo6SlNP YmplY3QqKTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZp ZXcuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKaW5kZXgg ZDhhNzJhZTM4ZjlmMTcxN2VjYmNjOTE2ODFhYzUxYThmODI1NGFlNi4uZTUxZThiZWJlNjViMWUx YTkxYzBiNDlkMmIyMTBkZGFiMTUxODliMCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv UGx1Z2luVmlldy5jcHAKQEAgLTIxNyw2ICsyMTcsNyBAQCBQbHVnaW5WaWV3OjpQbHVnaW5WaWV3 KFdlYkNvcmU6OkhUTUxQbHVnSW5FbGVtZW50KiBwbHVnaW5FbGVtZW50LCBQYXNzUmVmUHRyPFBs dQogICAgICwgbV9wYXJhbWV0ZXJzKHBhcmFtZXRlcnMpCiAgICAgLCBtX2lzSW5pdGlhbGl6ZWQo ZmFsc2UpCiAgICAgLCBtX2lzV2FpdGluZ1VudGlsTWVkaWFDYW5TdGFydChmYWxzZSkKKyAgICAs IG1faXNCZWluZ0Rlc3Ryb3llZChmYWxzZSkKICAgICAsIG1fcGVuZGluZ1VSTFJlcXVlc3RzVGlt ZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmUGx1Z2luVmlldzo6cGVuZGluZ1VSTFJlcXVlc3Rz VGltZXJGaXJlZCkKICAgICAsIG1fbnBSdW50aW1lT2JqZWN0TWFwKHRoaXMpCiB7CkBAIC0yMjQs NiArMjI1LDggQEAgUGx1Z2luVmlldzo6UGx1Z2luVmlldyhXZWJDb3JlOjpIVE1MUGx1Z0luRWxl bWVudCogcGx1Z2luRWxlbWVudCwgUGFzc1JlZlB0cjxQbHUKIAogUGx1Z2luVmlldzo6flBsdWdp blZpZXcoKQogeworICAgIEFTU0VSVCghbV9pc0JlaW5nRGVzdHJveWVkKTsKKwogICAgIGlmICht X2lzV2FpdGluZ1VudGlsTWVkaWFDYW5TdGFydCkKICAgICAgICAgbV9wbHVnaW5FbGVtZW50LT5k b2N1bWVudCgpLT5yZW1vdmVNZWRpYUNhblN0YXJ0TGlzdGVuZXIodGhpcyk7CiAKQEAgLTIzMiw4 ICsyMzUsMTEgQEAgUGx1Z2luVmlldzo6flBsdWdpblZpZXcoKQogICAgIGZvciAoRnJhbWVMb2Fk TWFwOjppdGVyYXRvciBpdCA9IG1fcGVuZGluZ0ZyYW1lTG9hZHMuYmVnaW4oKSwgZW5kID0gbV9w ZW5kaW5nRnJhbWVMb2Fkcy5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KQogICAgICAgICBpdC0+Zmly c3QtPnNldExvYWRMaXN0ZW5lcigwKTsKIAotICAgIGlmIChtX3BsdWdpbiAmJiBtX2lzSW5pdGlh bGl6ZWQpCisgICAgaWYgKG1fcGx1Z2luICYmIG1faXNJbml0aWFsaXplZCkgeworICAgICAgICBt X2lzQmVpbmdEZXN0cm95ZWQgPSB0cnVlOwogICAgICAgICBtX3BsdWdpbi0+ZGVzdHJveSgpOwor ICAgICAgICBtX2lzQmVpbmdEZXN0cm95ZWQgPSBmYWxzZTsKKyAgICB9CiAKICAgICAvLyBJbnZh bGlkYXRlIHRoZSBvYmplY3QgbWFwLgogICAgIG1fbnBSdW50aW1lT2JqZWN0TWFwLmludmFsaWRh dGUoKTsKQEAgLTI4NCw2ICsyOTAsMTAgQEAgdm9pZCBQbHVnaW5WaWV3Ojppbml0aWFsaXplUGx1 Z2luKCkKIAogSlNPYmplY3QqIFBsdWdpblZpZXc6OnNjcmlwdE9iamVjdChKU0dsb2JhbE9iamVj dCogZ2xvYmFsT2JqZWN0KQogeworICAgIC8vIFRoZSBwbHVnLWluIGNhbiBiZSBudWxsIGhlcmUg aWYgaXQgZmFpbGVkIHRvIGluaXRpYWxpemUuCisgICAgaWYgKCFtX3BsdWdpbikKKyAgICAgICAg cmV0dXJuIDA7CisgICAgCiAgICAgTlBPYmplY3QqIHNjcmlwdGFibGVOUE9iamVjdCA9IG1fcGx1 Z2luLT5wbHVnaW5TY3JpcHRhYmxlTlBPYmplY3QoKTsKICAgICBpZiAoIXNjcmlwdGFibGVOUE9i amVjdCkKICAgICAgICAgcmV0dXJuIDA7CkBAIC02NDQsNyArNjU0LDYgQEAgYm9vbCBQbHVnaW5W aWV3OjpldmFsdWF0ZShOUE9iamVjdCogbnBPYmplY3QsIGNvbnN0IFN0cmluZyZzY3JpcHRTdHJp bmcsIE5QVmFyaWEKICAgICBib29sIG9sZEFsbG93UG9wdXBzID0gZnJhbWUoKS0+c2NyaXB0KCkt PmFsbG93UG9wdXBzRnJvbVBsdWdpbigpOwogICAgIGZyYW1lKCktPnNjcmlwdCgpLT5zZXRBbGxv d1BvcHVwc0Zyb21QbHVnaW4oYWxsb3dQb3B1cHMpOwogCi0gICAgLy8gRklYTUU6IFdoYXQgaGFw cGVucyBpZiBjYWxsaW5nIGV2YWx1YXRlIHdpbGwgY2F1c2UgdGhlIHBsdWctaW4gdmlldyB0byBn byBhd2F5LgogICAgIGJvb2wgcmV0dXJuVmFsdWUgPSBtX25wUnVudGltZU9iamVjdE1hcC5ldmFs dWF0ZShucE9iamVjdCwgc2NyaXB0U3RyaW5nLCByZXN1bHQpOwogCiAgICAgZnJhbWUoKS0+c2Ny aXB0KCktPnNldEFsbG93UG9wdXBzRnJvbVBsdWdpbihvbGRBbGxvd1BvcHVwcyk7CmRpZmYgLS1n aXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmggYi9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKaW5kZXggYjM5ZjZjMjRiNDJhYzgzZWM3NzFh ZjhjNGY1OTQ4NTQzYjcyYzQ1Yi4uYzBlMDNmMGRhZTBjMGNkNTYwZGRiY2UzMGE4MTQ4YjJmMmY4 ZjBhMiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5o CisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaApAQCAtNTQsNiAr NTQsOCBAQCBwdWJsaWM6CiAKICAgICBXZWJDb3JlOjpGcmFtZSogZnJhbWUoKTsKIAorICAgIGJv b2wgaXNCZWluZ0Rlc3Ryb3llZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNCZWluZ0Rlc3Ryb3llZDsg fQorCiBwcml2YXRlOgogICAgIFBsdWdpblZpZXcoV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQq LCBQYXNzUmVmUHRyPFBsdWdpbj4sIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYgcGFyYW1ldGVy cyk7CiAgICAgdmlydHVhbCB+UGx1Z2luVmlldygpOwpAQCAtMTE2LDYgKzExOCw3IEBAIHByaXZh dGU6CiAgICAgCiAgICAgYm9vbCBtX2lzSW5pdGlhbGl6ZWQ7CiAgICAgYm9vbCBtX2lzV2FpdGlu Z1VudGlsTWVkaWFDYW5TdGFydDsKKyAgICBib29sIG1faXNCZWluZ0Rlc3Ryb3llZDsKIAogICAg IC8vIFBlbmRpbmcgVVJMUmVxdWVzdHMgdGhhdCB0aGUgcGx1Zy1pbiBoYXMgbWFkZS4KICAgICBE ZXF1ZTxSZWZQdHI8VVJMUmVxdWVzdD4gPiBtX3BlbmRpbmdVUkxSZXF1ZXN0czsK