48882 2010-11-02 15:59:02 -0700 Add support for NP_HasMethod and NP_Invoke 2010-11-02 16:31:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 303746 0 andersca 2010-11-02 15:59:02 -0700 Add support for NP_HasMethod and NP_Invoke 303750 1 72757 andersca 2010-11-02 16:02:03 -0700 Created attachment 72757 Patch 303756 2 webkit.review.bot 2010-11-02 16:05:55 -0700 Attachment 72757 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/platform/mac-wk2/Skipped', u'WebKit2/ChangeLog', u'WebKit2/Platform/CoreIPC/HandleMessage.h', u'WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp', u'WebKit2/Shared/Plugins/NPObjectMessageReceiver.h', u'WebKit2/Shared/Plugins/NPObjectMessageReceiver.messages.in', u'WebKit2/Shared/Plugins/NPObjectProxy.cpp', u'WebKit2/Shared/Plugins/NPObjectProxy.h']" exit_code: 1 WebKit2/Shared/Plugins/NPObjectProxy.cpp:195: NPObjectProxy::NP_HasMethod is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/Shared/Plugins/NPObjectProxy.cpp:200: NPObjectProxy::NP_Invoke is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 303757 3 72757 aroben 2010-11-02 16:06:58 -0700 Comment on attachment 72757 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=72757&action=review > WebKit2/Shared/Plugins/NPObjectMessageReceiver.cpp:82 > + Vector<NPVariant> arguments; > + for (size_t i = 0; i < argumentsData.size(); ++i) > + arguments.append(m_npRemoteObjectMap->npVariantDataToNPVariant(argumentsData[i])); Don't we need to release these NPVariants, too? 303779 4 andersca 2010-11-02 16:31:07 -0700 Committed r71183: <http://trac.webkit.org/changeset/71183> 72757 2010-11-02 16:02:03 -0700 2010-11-02 16:06:57 -0700 Patch bug-48882-20101102160202.patch text/plain 11523 andersca ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjYzRhYjAwMzY4NjYzN2FiOGQ4ZmI0Y2I0N2UwZjNjNTlhMzU2Yzk2Li4wMWI0NTYw NzY4YTMxMTdiOTMyNmQ4MWU5OWY4M2QzMWFkNGQ2YWE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAK IDIwMTAtMTEtMDIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCBm b3IgTlBfSGFzTWV0aG9kIGFuZCBOUF9JbnZva2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4ODgyCisKKyAgICAgICAgUmVtb3ZlIG5vdyBwYXNzaW5n IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMi9Ta2lwcGVkOgorCisyMDEwLTEx LTAyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2 aWV3ZWQgYnkgU2FtIFdlaW5pZy4KIAogICAgICAgICBJbXBsZW1lbnQgTlBfSGFzUHJvcGVydHkg Zm9yIE5QT2JqZWN0UHJveHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13 azIvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvU2tpcHBlZAppbmRleCA3 MDk0OTQ1ODhiZDIwMDcxYzgwNzRlZDgzOTljNmIzYTZmZmZiMTYwLi45OWI3YzQ4NzcxMGNjNDA0 MjcyMDI1ZjhhZTQyYzIzOGE3NDA3Y2M4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9tYWMtd2syL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9Ta2lw cGVkCkBAIC0xNzE3LDggKzE3MTcsNiBAQCBodHRwL3Rlc3RzL3BsdWdpbnMvbnBhcGktcmVzcG9u c2UtaGVhZGVycy5odG1sCiBwbHVnaW5zL2Rlc3Ryb3ktZHVyaW5nLW5wcC1uZXcuaHRtbAogcGx1 Z2lucy9kZXN0cm95LXN0cmVhbS10d2ljZS5odG1sCiBwbHVnaW5zL2VtYmVkLWluc2lkZS1vYmpl Y3QuaHRtbAotcGx1Z2lucy9nZXQtZW1wdHktdXJsLmh0bWwKLXBsdWdpbnMvZ2V0LWZpbGUtdXJs Lmh0bWwKIHBsdWdpbnMvZ2V0LWphdmFzY3JpcHQtdXJsLmh0bWwKIHBsdWdpbnMvZ2V0LXVybC13 aXRoLWlmcmFtZS10YXJnZXQuaHRtbAogcGx1Z2lucy9nZXR1cmwtcmVwbGFjZS1xdWVyeS5odG1s CkBAIC0xNzQ0LDcgKzE3NDIsNiBAQCBwbHVnaW5zL25wcnVudGltZS9nZXQtcHJvcGVydHktcmV0 dXJuLXZhbHVlLmh0bWwKIHBsdWdpbnMvbnBydW50aW1lL2lkZW50aWZpZXItY29udmVyc2lvbi5o dG1sCiBwbHVnaW5zL25wcnVudGltZS9pbnZva2UtYnJvd3NlcmZ1bmNzLmh0bWwKIHBsdWdpbnMv bnBydW50aW1lL2ludm9rZS1kZWZhdWx0Lmh0bWwKLXBsdWdpbnMvbnBydW50aW1lL2ludm9rZS5o dG1sCiBwbHVnaW5zL25wcnVudGltZS9ucHJ1bnRpbWUuaHRtbAogcGx1Z2lucy9ucHJ1bnRpbWUv b2JqZWN0LWZyb20tZGVzdHJveWVkLXBsdWdpbi5odG1sCiBwbHVnaW5zL25wcnVudGltZS9wbHVn aW4tc2NyaXB0YWJsZS1vYmplY3QtaW52b2tlLWRlZmF1bHQuaHRtbApkaWZmIC0tZ2l0IGEvV2Vi S2l0Mi9DaGFuZ2VMb2cgYi9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1M2E1ODc4YjA4Mjg2ZGE0 ZTE2MGJhYmJmZjg1Mzk2MjdmZDczOTA5Li5lYjFhN2UzNTI0Mjk3NTkxOTZiNjNiYzkzMWU1ZjA0 YzdhODYyZjMwIDEwMDY0NAotLS0gYS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9XZWJLaXQyL0No YW5nZUxvZwpAQCAtMSw1ICsxLDQyIEBACiAyMDEwLTExLTAyICBBbmRlcnMgQ2FybHNzb24gIDxh bmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIE5QX0hhc01ldGhvZCBhbmQgTlBfSW52b2tlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODg4MgorCisg ICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmg6CisgICAgICAgIChDb3Jl SVBDOjpjYWxsTWVtYmVyRnVuY3Rpb24pOgorICAgICAgICBBZGQgbmV3IG92ZXJsb2FkLgorCisg ICAgICAgICogU2hhcmVkL1BsdWdpbnMvTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIuY3BwOgorICAg ICAgICAoV2ViS2l0OjpOUE9iamVjdE1lc3NhZ2VSZWNlaXZlcjo6aGFzTWV0aG9kKToKKyAgICAg ICAgQ2FsbCBoYXNNZXRob2QgYW5kIHJldHVybiB0aGUgcmVzdWx0LgorCisgICAgICAgIChXZWJL aXQ6Ok5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyOjppbnZva2UpOgorICAgICAgICBDb252ZXJ0IHRo ZSBhcmd1bWVudHMsIGNhbGwgaW52b2tlIGFuZCByZXR1cm4gdGhlIHJlc3VsdC4KKworICAgICAg ICAoV2ViS2l0OjpOUE9iamVjdE1lc3NhZ2VSZWNlaXZlcjo6Z2V0UHJvcGVydHkpOgorICAgICAg ICBSZWxlYXNlIHRoZSBjb252ZXJ0ZWQgdmFyaWFudC4KKworICAgICAgICAqIFNoYXJlZC9QbHVn aW5zL05QT2JqZWN0TWVzc2FnZVJlY2VpdmVyLm1lc3NhZ2VzLmluOgorICAgICAgICBBZGQgSGFz TWV0aG9kIGFuZCBJbnZva2UgbWVzc2FnZXMuCisgICAgICAgIAorICAgICAgICAqIFNoYXJlZC9Q bHVnaW5zL05QT2JqZWN0UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpOUE9iamVjdFByb3h5 OjpoYXNNZXRob2QpOgorICAgICAgICBTZW5kIHRoZSBIYXNNZXRob2QgbWVzc2FnZS4KKworICAg ICAgICAoV2ViS2l0OjpOUE9iamVjdFByb3h5OjppbnZva2UpOgorICAgICAgICBTZW5kIHRoZSBJ bnZva2UgbWVzc2FnZS4KKworICAgICAgICAoV2ViS2l0OjpOUE9iamVjdFByb3h5OjpOUF9IYXNN ZXRob2QpOgorICAgICAgICBDYWxsIGhhc01ldGhvZC4KKworICAgICAgICAoV2ViS2l0OjpOUE9i amVjdFByb3h5OjpOUF9JbnZva2UpOgorICAgICAgICBDYWxsIGludm9rZS4KKworMjAxMC0xMS0w MiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmll d2VkIGJ5IFNhbSBXZWluaWcuCiAKICAgICAgICAgSW1wbGVtZW50IE5QX0hhc1Byb3BlcnR5IGZv ciBOUE9iamVjdFByb3h5CmRpZmYgLS1naXQgYS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvSGFu ZGxlTWVzc2FnZS5oIGIvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaApp bmRleCAyN2U5ODY0ZDEyN2Y3N2I3NGQyMzkzM2NiOTJiNDgwNWRmNmM0NjJjLi40ZjI3NTk4ZDk3 NGE4YWNlZDI1YmRhZTgzM2NkNzYwNTNkMGU4M2Q3IDEwMDY0NAotLS0gYS9XZWJLaXQyL1BsYXRm b3JtL0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oCisrKyBiL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQ Qy9IYW5kbGVNZXNzYWdlLmgKQEAgLTEwMyw2ICsxMDMsMTIgQEAgdm9pZCBjYWxsTWVtYmVyRnVu Y3Rpb24oY29uc3QgQXJndW1lbnRzMjxQMSwgUDI+JiBhcmdzLCBBcmd1bWVudHMxPFIxPiYgcmVw bHlBcmcKICAgICAob2JqZWN0LT4qZnVuY3Rpb24pKGFyZ3MuYXJndW1lbnQxLCBhcmdzLmFyZ3Vt ZW50MiwgcmVwbHlBcmdzLmFyZ3VtZW50MSk7CiB9CiAKK3RlbXBsYXRlPHR5cGVuYW1lIEMsIHR5 cGVuYW1lIE1GLCB0eXBlbmFtZSBQMSwgdHlwZW5hbWUgUDIsIHR5cGVuYW1lIFIxLCB0eXBlbmFt ZSBSMj4KK3ZvaWQgY2FsbE1lbWJlckZ1bmN0aW9uKGNvbnN0IEFyZ3VtZW50czI8UDEsIFAyPiYg YXJncywgQXJndW1lbnRzMjxSMSwgUjI+JiByZXBseUFyZ3MsIEMqIG9iamVjdCwgTUYgZnVuY3Rp b24pCit7CisgICAgKG9iamVjdC0+KmZ1bmN0aW9uKShhcmdzLmFyZ3VtZW50MSwgYXJncy5hcmd1 bWVudDIsIHJlcGx5QXJncy5hcmd1bWVudDEsIHJlcGx5QXJncy5hcmd1bWVudDIpOworfQorCiB0 ZW1wbGF0ZTx0eXBlbmFtZSBDLCB0eXBlbmFtZSBNRiwgdHlwZW5hbWUgUDEsIHR5cGVuYW1lIFAy LCB0eXBlbmFtZSBQMywgdHlwZW5hbWUgUjE+CiB2b2lkIGNhbGxNZW1iZXJGdW5jdGlvbihjb25z dCBBcmd1bWVudHMzPFAxLCBQMiwgUDM+JiBhcmdzLCBBcmd1bWVudHMxPFIxPiYgcmVwbHlBcmdz LCBDKiBvYmplY3QsIE1GIGZ1bmN0aW9uKQogewpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9TaGFyZWQv UGx1Z2lucy9OUE9iamVjdE1lc3NhZ2VSZWNlaXZlci5jcHAgYi9XZWJLaXQyL1NoYXJlZC9QbHVn aW5zL05QT2JqZWN0TWVzc2FnZVJlY2VpdmVyLmNwcAppbmRleCA1Y2M3NDFmODk3Yzk4ODJlYWUy YzEyMThjM2JhNDkwYjNhMDIzYjgyLi4zMmY0ZDViYzk3MThmNDIyMjY2NjRhZWVjYjc5MzA3YjZk ODFkYmYwIDEwMDY0NAotLS0gYS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QT2JqZWN0TWVzc2Fn ZVJlY2VpdmVyLmNwcAorKysgYi9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QT2JqZWN0TWVzc2Fn ZVJlY2VpdmVyLmNwcApAQCAtNjAsNiArNjAsMzkgQEAgdm9pZCBOUE9iamVjdE1lc3NhZ2VSZWNl aXZlcjo6ZGVhbGxvY2F0ZSgpCiAgICAgZGVsZXRlIHRoaXM7CiB9CiAKK3ZvaWQgTlBPYmplY3RN ZXNzYWdlUmVjZWl2ZXI6Omhhc01ldGhvZChjb25zdCBOUElkZW50aWZpZXJEYXRhJiBtZXRob2RO YW1lRGF0YSwgYm9vbCYgcmV0dXJuVmFsdWUpCit7CisgICAgaWYgKCFtX25wT2JqZWN0LT5fY2xh c3MtPmhhc01ldGhvZCkgeworICAgICAgICByZXR1cm5WYWx1ZSA9IGZhbHNlOworICAgICAgICBy ZXR1cm47CisgICAgfQorICAgIAorICAgIHJldHVyblZhbHVlID0gbV9ucE9iamVjdC0+X2NsYXNz LT5oYXNNZXRob2QobV9ucE9iamVjdCwgbWV0aG9kTmFtZURhdGEuY3JlYXRlTlBJZGVudGlmaWVy KCkpOworfQorCit2b2lkIE5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyOjppbnZva2UoY29uc3QgTlBJ ZGVudGlmaWVyRGF0YSYgbWV0aG9kTmFtZURhdGEsIGNvbnN0IFZlY3RvcjxOUFZhcmlhbnREYXRh PiYgYXJndW1lbnRzRGF0YSwgYm9vbCYgcmV0dXJuVmFsdWUsIE5QVmFyaWFudERhdGEmIHJlc3Vs dERhdGEpCit7CisgICAgaWYgKCFtX25wT2JqZWN0LT5fY2xhc3MtPmludm9rZSkgeworICAgICAg ICByZXR1cm5WYWx1ZSA9IGZhbHNlOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgVmVj dG9yPE5QVmFyaWFudD4gYXJndW1lbnRzOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgYXJn dW1lbnRzRGF0YS5zaXplKCk7ICsraSkKKyAgICAgICAgYXJndW1lbnRzLmFwcGVuZChtX25wUmVt b3RlT2JqZWN0TWFwLT5ucFZhcmlhbnREYXRhVG9OUFZhcmlhbnQoYXJndW1lbnRzRGF0YVtpXSkp OworCisgICAgTlBWYXJpYW50IHJlc3VsdDsKKyAgICByZXR1cm5WYWx1ZSA9IG1fbnBPYmplY3Qt Pl9jbGFzcy0+aW52b2tlKG1fbnBPYmplY3QsIG1ldGhvZE5hbWVEYXRhLmNyZWF0ZU5QSWRlbnRp ZmllcigpLCBhcmd1bWVudHMuZGF0YSgpLCBhcmd1bWVudHMuc2l6ZSgpLCAmcmVzdWx0KTsKKyAg ICBpZiAoIXJldHVyblZhbHVlKQorICAgICAgICByZXR1cm47CisgICAgCisgICAgLy8gQ29udmVy dCB0aGUgTlBWYXJpYW50IHRvIGFuIE5QVmFyaWFudERhdGEuCisgICAgcmVzdWx0RGF0YSA9IG1f bnBSZW1vdGVPYmplY3RNYXAtPm5wVmFyaWFudFRvTlBWYXJpYW50RGF0YShyZXN1bHQpOworCisg ICAgLy8gQW5kIHJlbGVhc2UgdGhlIHJlc3VsdC4KKyAgICByZWxlYXNlTlBWYXJpYW50VmFsdWUo JnJlc3VsdCk7Cit9CisKIHZvaWQgTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXI6Omhhc1Byb3BlcnR5 KGNvbnN0IE5QSWRlbnRpZmllckRhdGEmIHByb3BlcnR5TmFtZURhdGEsIGJvb2wmIHJldHVyblZh bHVlKQogewogICAgIGlmICghbV9ucE9iamVjdC0+X2NsYXNzLT5oYXNQcm9wZXJ0eSkgewpAQCAt ODQsNiArMTE3LDkgQEAgdm9pZCBOUE9iamVjdE1lc3NhZ2VSZWNlaXZlcjo6Z2V0UHJvcGVydHko Y29uc3QgTlBJZGVudGlmaWVyRGF0YSYgcHJvcGVydHlOYW1lRGEKIAogICAgIC8vIENvbnZlcnQg dGhlIE5QVmFyaWFudCB0byBhbiBOUFZhcmlhbnREYXRhLgogICAgIHJlc3VsdERhdGEgPSBtX25w UmVtb3RlT2JqZWN0TWFwLT5ucFZhcmlhbnRUb05QVmFyaWFudERhdGEocmVzdWx0KTsKKworICAg IC8vIEFuZCByZWxlYXNlIHRoZSByZXN1bHQuCisgICAgcmVsZWFzZU5QVmFyaWFudFZhbHVlKCZy ZXN1bHQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYktpdDIv U2hhcmVkL1BsdWdpbnMvTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIuaCBiL1dlYktpdDIvU2hhcmVk L1BsdWdpbnMvTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIuaAppbmRleCBhNzhlMTNkYjU5Mzc1MmJm NmZhYzRlODEzZWFkNzM3N2Q4OTUwYWE1Li5jMzY2MjA2NDQ1MDdhYTNhYzRmNWM1Mzg1MjI4MTc3 MTg4ZDA1NWNhIDEwMDY0NAotLS0gYS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QT2JqZWN0TWVz c2FnZVJlY2VpdmVyLmgKKysrIGIvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUE9iamVjdE1lc3Nh Z2VSZWNlaXZlci5oCkBAIC01Myw2ICs1Myw4IEBAIHByaXZhdGU6CiAKICAgICAvLyBNZXNzYWdl IGhhbmRsZXJzLgogICAgIHZvaWQgZGVhbGxvY2F0ZSgpOworICAgIHZvaWQgaGFzTWV0aG9kKGNv bnN0IE5QSWRlbnRpZmllckRhdGEmLCBib29sJiByZXR1cm5WYWx1ZSk7CisgICAgdm9pZCBpbnZv a2UoY29uc3QgTlBJZGVudGlmaWVyRGF0YSYsIGNvbnN0IFZlY3RvcjxOUFZhcmlhbnREYXRhPiYg YXJndW1lbnRzRGF0YSwgYm9vbCYgcmV0dXJuVmFsdWUsIE5QVmFyaWFudERhdGEmIHJlc3VsdERh dGEpOwogICAgIHZvaWQgaGFzUHJvcGVydHkoY29uc3QgTlBJZGVudGlmaWVyRGF0YSYsIGJvb2wm IHJldHVyblZhbHVlKTsKICAgICB2b2lkIGdldFByb3BlcnR5KGNvbnN0IE5QSWRlbnRpZmllckRh dGEmLCBib29sJiByZXR1cm5WYWx1ZSwgTlBWYXJpYW50RGF0YSYgcmVzdWx0RGF0YSk7CiAKZGlm ZiAtLWdpdCBhL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIu bWVzc2FnZXMuaW4gYi9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QT2JqZWN0TWVzc2FnZVJlY2Vp dmVyLm1lc3NhZ2VzLmluCmluZGV4IDNkZDA3MjJjZjNkMGYzNzExYzM4NWVkMmMxODk3NTg5OGQ3 MjExMDQuLjYwNzQ0YzM4Y2ZkZTkxZWJkYmM2OGYxZWUwZTQzOWZiYzFjNWI0OTcgMTAwNjQ0Ci0t LSBhL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXIubWVzc2Fn ZXMuaW4KKysrIGIvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUE9iamVjdE1lc3NhZ2VSZWNlaXZl ci5tZXNzYWdlcy5pbgpAQCAtMjQsNiArMjQsOCBAQAogCiBtZXNzYWdlcyAtPiBOUE9iamVjdE1l c3NhZ2VSZWNlaXZlciB7CiAgICAgRGVhbGxvY2F0ZSgpIC0+ICgpCisgICAgSGFzTWV0aG9kKFdl YktpdDo6TlBJZGVudGlmaWVyRGF0YSBtZXRob2ROYW1lKSAtPiAoYm9vbCByZXR1cm5WYWx1ZSkK KyAgICBJbnZva2UoV2ViS2l0OjpOUElkZW50aWZpZXJEYXRhIG1ldGhvZE5hbWUsIFZlY3RvcjxX ZWJLaXQ6Ok5QVmFyaWFudERhdGE+IGFyZ3VtZW50c0RhdGEpIC0+IChib29sIHJldHVyblZhbHVl LCBXZWJLaXQ6Ok5QVmFyaWFudERhdGEgcmVzdWx0RGF0YSkKICAgICBIYXNQcm9wZXJ0eShXZWJL aXQ6Ok5QSWRlbnRpZmllckRhdGEgcHJvcGVydHlOYW1lKSAtPiAoYm9vbCByZXR1cm5WYWx1ZSkK ICAgICBHZXRQcm9wZXJ0eShXZWJLaXQ6Ok5QSWRlbnRpZmllckRhdGEgcHJvcGVydHlOYW1lKSAt PiAoYm9vbCByZXR1cm5WYWx1ZSwgV2ViS2l0OjpOUFZhcmlhbnREYXRhIHJlc3VsdERhdGEpCiB9 CmRpZmYgLS1naXQgYS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QT2JqZWN0UHJveHkuY3BwIGIv V2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUE9iamVjdFByb3h5LmNwcAppbmRleCBjM2M0ZGU1ODgz YTdhNjZlY2JlNTE5ZDU1MjhhOGM2OWE1YTc0Y2VmLi45NjE5YTg2MzJmOGY1NWVmNTM5ZTNhOTFj MzY2Y2FjMTczZjY3YzdhIDEwMDY0NAotLS0gYS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05QT2Jq ZWN0UHJveHkuY3BwCisrKyBiL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTlBPYmplY3RQcm94eS5j cHAKQEAgLTI3LDYgKzI3LDcgQEAKIAogI2luY2x1ZGUgIk5QT2JqZWN0UHJveHkuaCIKIAorI2lu Y2x1ZGUgIkFyZ3VtZW50Q29kZXJzLmgiCiAjaW5jbHVkZSAiQ29ubmVjdGlvbi5oIgogI2luY2x1 ZGUgIk5QSWRlbnRpZmllckRhdGEuaCIKICNpbmNsdWRlICJOUE9iamVjdE1lc3NhZ2VSZWNlaXZl ck1lc3NhZ2VzLmgiCkBAIC04NCw2ICs4NSw0NCBAQCB2b2lkIE5QT2JqZWN0UHJveHk6OmluaXRp YWxpemUoTlBSZW1vdGVPYmplY3RNYXAqIG5wUmVtb3RlT2JqZWN0TWFwLCB1aW50NjRfdCBucAog ICAgIG1fbnBPYmplY3RJRCA9IG5wT2JqZWN0SUQ7CiB9CiAKK2Jvb2wgTlBPYmplY3RQcm94eTo6 aGFzTWV0aG9kKE5QSWRlbnRpZmllciBtZXRob2ROYW1lKQoreworICAgIGlmICghbV9ucFJlbW90 ZU9iamVjdE1hcCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAorICAgIE5QSWRlbnRpZmll ckRhdGEgbWV0aG9kTmFtZURhdGEgPSBOUElkZW50aWZpZXJEYXRhOjpmcm9tTlBJZGVudGlmaWVy KG1ldGhvZE5hbWUpOworICAgIAorICAgIGJvb2wgcmV0dXJuVmFsdWUgPSBmYWxzZTsKKyAgICAK KyAgICBpZiAoIW1fbnBSZW1vdGVPYmplY3RNYXAtPmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVz c2FnZXM6Ok5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyOjpIYXNNZXRob2QobWV0aG9kTmFtZURhdGEp LCBNZXNzYWdlczo6TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXI6Okhhc01ldGhvZDo6UmVwbHkocmV0 dXJuVmFsdWUpLCBtX25wT2JqZWN0SUQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgCisg ICAgcmV0dXJuIHJldHVyblZhbHVlOworfQorCitib29sIE5QT2JqZWN0UHJveHk6Omludm9rZShO UElkZW50aWZpZXIgbWV0aG9kTmFtZSwgY29uc3QgTlBWYXJpYW50KiBhcmd1bWVudHMsIHVpbnQz Ml90IGFyZ3VtZW50Q291bnQsIE5QVmFyaWFudCogcmVzdWx0KQoreworICAgIGlmICghbV9ucFJl bW90ZU9iamVjdE1hcCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgTlBJZGVudGlmaWVy RGF0YSBtZXRob2ROYW1lRGF0YSA9IE5QSWRlbnRpZmllckRhdGE6OmZyb21OUElkZW50aWZpZXIo bWV0aG9kTmFtZSk7CisgICAgVmVjdG9yPE5QVmFyaWFudERhdGE+IGFyZ3VtZW50c0RhdGE7Cisg ICAgZm9yICh1aW50MzJfdCBpID0gMDsgaSA8IGFyZ3VtZW50Q291bnQ7ICsraSkKKyAgICAgICAg YXJndW1lbnRzRGF0YS5hcHBlbmQobV9ucFJlbW90ZU9iamVjdE1hcC0+bnBWYXJpYW50VG9OUFZh cmlhbnREYXRhKGFyZ3VtZW50c1tpXSkpOworCisgICAgYm9vbCByZXR1cm5WYWx1ZSA9IGZhbHNl OworICAgIE5QVmFyaWFudERhdGEgcmVzdWx0RGF0YTsKKyAgICAKKyAgICBpZiAoIW1fbnBSZW1v dGVPYmplY3RNYXAtPmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVzc2FnZXM6Ok5QT2JqZWN0TWVz c2FnZVJlY2VpdmVyOjpJbnZva2UobWV0aG9kTmFtZURhdGEsIGFyZ3VtZW50c0RhdGEpLCBNZXNz YWdlczo6TlBPYmplY3RNZXNzYWdlUmVjZWl2ZXI6Okludm9rZTo6UmVwbHkocmV0dXJuVmFsdWUs IHJlc3VsdERhdGEpLCBtX25wT2JqZWN0SUQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg CisgICAgaWYgKCFyZXR1cm5WYWx1ZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIAorICAg ICpyZXN1bHQgPSBtX25wUmVtb3RlT2JqZWN0TWFwLT5ucFZhcmlhbnREYXRhVG9OUFZhcmlhbnQo cmVzdWx0RGF0YSk7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIGJvb2wgTlBPYmplY3RQcm94eTo6 aGFzUHJvcGVydHkoTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSkKIHsKICAgICBpZiAoIW1fbnBS ZW1vdGVPYmplY3RNYXApCkBAIC0xNTMsMTYgKzE5MiwxNCBAQCB2b2lkIE5QT2JqZWN0UHJveHk6 Ok5QX0RlYWxsb2NhdGUoTlBPYmplY3QqIG5wT2JqZWN0KQogICAgIGRlbGV0ZSBucE9iamVjdFBy b3h5OwogfQogCi1ib29sIE5QT2JqZWN0UHJveHk6Ok5QX0hhc01ldGhvZChOUE9iamVjdCosIE5Q SWRlbnRpZmllciBtZXRob2ROYW1lKQorYm9vbCBOUE9iamVjdFByb3h5OjpOUF9IYXNNZXRob2Qo TlBPYmplY3QqIG5wT2JqZWN0LCBOUElkZW50aWZpZXIgbWV0aG9kTmFtZSkKIHsKLSAgICBub3RJ bXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gdG9OUE9iamVjdFBy b3h5KG5wT2JqZWN0KS0+aGFzTWV0aG9kKG1ldGhvZE5hbWUpOwogfQogCi1ib29sIE5QT2JqZWN0 UHJveHk6Ok5QX0ludm9rZShOUE9iamVjdCosIE5QSWRlbnRpZmllciBtZXRob2ROYW1lLCBjb25z dCBOUFZhcmlhbnQqIGFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50 KiByZXN1bHQpCitib29sIE5QT2JqZWN0UHJveHk6Ok5QX0ludm9rZShOUE9iamVjdCogbnBPYmpl Y3QsIE5QSWRlbnRpZmllciBtZXRob2ROYW1lLCBjb25zdCBOUFZhcmlhbnQqIGFyZ3VtZW50cywg dWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1bHQpCiB7Ci0gICAgbm90SW1w bGVtZW50ZWQoKTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHRvTlBPYmplY3RQcm94 eShucE9iamVjdCktPmludm9rZShtZXRob2ROYW1lLCBhcmd1bWVudHMsIGFyZ3VtZW50Q291bnQs IHJlc3VsdCk7CiB9CiAKIGJvb2wgTlBPYmplY3RQcm94eTo6TlBfSW52b2tlRGVmYXVsdChOUE9i amVjdCosIGNvbnN0IE5QVmFyaWFudCogYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50 LCBOUFZhcmlhbnQqIHJlc3VsdCkKZGlmZiAtLWdpdCBhL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMv TlBPYmplY3RQcm94eS5oIGIvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OUE9iamVjdFByb3h5LmgK aW5kZXggY2I5ZDI0YWNkY2M0ZDhlZDliYTU1YmE5MzYyMmJlNGQ4MzI5ZTc2Yy4uMjE1NmY4MDFl ZmU3MDc1Nzk3MTg0MWRlYWM2OWJmMzg3ODM4YjQwMSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9TaGFy ZWQvUGx1Z2lucy9OUE9iamVjdFByb3h5LmgKKysrIGIvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9O UE9iamVjdFByb3h5LmgKQEAgLTU3LDYgKzU3LDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgaW5p dGlhbGl6ZShOUFJlbW90ZU9iamVjdE1hcCogbnBSZW1vdGVPYmplY3RNYXAsIHVpbnQ2NF90IG5w T2JqZWN0SUQpOwogCisgICAgYm9vbCBoYXNNZXRob2QoTlBJZGVudGlmaWVyIG1ldGhvZE5hbWUp OworICAgIGJvb2wgaW52b2tlKE5QSWRlbnRpZmllciBtZXRob2ROYW1lLCBjb25zdCBOUFZhcmlh bnQqIGFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTlBWYXJpYW50KiByZXN1bHQp OwogICAgIGJvb2wgaGFzUHJvcGVydHkoTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSk7CiAgICAg Ym9vbCBnZXRQcm9wZXJ0eShOUElkZW50aWZpZXIgcHJvcGVydHlOYW1lLCBOUFZhcmlhbnQqIHJl c3VsdCk7CiAK