42526 2010-07-18 15:16:41 -0700 More NPRuntime work 2010-07-18 15:27:50 -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 253011 0 andersca 2010-07-18 15:16:41 -0700 More NPRuntime work 253012 1 61914 andersca 2010-07-18 15:19:09 -0700 Created attachment 61914 Patch 253013 2 webkit.review.bot 2010-07-18 15:21:14 -0700 Attachment 61914 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:313: NPN_GetProperty is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:336: NPN_HasProperty is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/NPJSObjectMap.cpp:75: NP_HasProperty is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/NPJSObjectMap.cpp:76: NP_GetProperty is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/NPJSObjectMap.cpp:174: NPJSObject::NP_HasProperty is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/NPJSObjectMap.cpp:179: NPJSObject::NP_GetProperty is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 6 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 253014 3 61914 sam 2010-07-18 15:22:39 -0700 Comment on attachment 61914 Patch > + static bool NP_HasProperty(NPObject *npobj, NPIdentifier name); > + static bool NP_GetProperty(NPObject *npobj, NPIdentifier name, NPVariant *result); * on the wrong side. > + > + const char *string = identifierRep->string(); * on the wrong side. Otherwise, r=me. 253018 4 andersca 2010-07-18 15:27:50 -0700 Committed r63636: <http://trac.webkit.org/changeset/63636> 61914 2010-07-18 15:19:09 -0700 2010-07-18 15:22:38 -0700 Patch bug-42526-20100718151908.patch text/plain 8310 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZWViZTZlYTQ2MDk5ZmYyZDlmNDE0YzUxYjFiNjc4ZDQzMTBlNmFlMy4uZjYyZmYyYWNlZDc1NTdi NDRiNWViNmYzOGJhYjNkMThhZmJhZTI5YiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0NCBAQAogMjAxMC0wNy0xOCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vcmUgTlBSdW50aW1lIHdvcmsKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNTI2CisKKyAgICAgICAg KiBXZWJQcm9jZXNzL1BsdWdpbnMvTlBKU09iamVjdE1hcC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OmlkZW50aWZpZXJGcm9tSWRlbnRpZmllclJlcCk6CisgICAgICAgIChXZWJLaXQ6Ok5QSlNPYmpl Y3Q6Omhhc1Byb3BlcnR5KToKKyAgICAgICAgQ2hlY2sgaWYgdGhlIEpTT2JqZWN0IGhhcyB0aGUg Z2l2ZW4gcHJvcGVydHkuCisKKyAgICAgICAgKFdlYktpdDo6TlBKU09iamVjdDo6Z2V0UHJvcGVy dHkpOgorICAgICAgICBBZGQgc3R1YmJlZCBvdXQgZnVuY3Rpb24uCisKKyAgICAgICAgKFdlYktp dDo6TlBKU09iamVjdDo6bnBDbGFzcyk6CisgICAgICAgIEFkZCBOUF9IYXNQcm9wZXJ0eSBhbmQg TlBfR2V0UHJvcGVydHkuCisKKyAgICAgICAgKFdlYktpdDo6TlBKU09iamVjdDo6TlBfSGFzUHJv cGVydHkpOgorICAgICAgICBDYWxsIE5QSlNPYmplY3Q6Omhhc1Byb3BlcnR5LgorCisgICAgICAg IChXZWJLaXQ6Ok5QSlNPYmplY3Q6Ok5QX0dldFByb3BlcnR5KToKKyAgICAgICAgQ2FsbCBOUEpT T2JqZWN0OjpnZXRQcm9wZXJ0eS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OUFJ1 bnRpbWVVdGlsaXRpZXMuY3BwOgorICAgICAgICAoV2ViS2l0OjpyZWxlYXNlTlBWYXJpYW50VmFs dWUpOgorICAgICAgICBSZWxlYXNlIHRoZSBnaXZlbiBOUFZhcmlhbnQuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1BsdWdpbnMvTlBSdW50aW1lVXRpbGl0aWVzLmg6CisgICAgICAgICogV2ViUHJv Y2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNwcDoKKyAgICAgICAg KFdlYktpdDo6TlBOX0dldFByb3BlcnR5KToKKyAgICAgICAgQ2FsbCB0aGUgTlBDbGFzcyBHZXRQ cm9wZXJ0eSBmdW5jdGlvbi4KKworICAgICAgICAoV2ViS2l0OjpOUE5fSGFzUHJvcGVydHkpOgor ICAgICAgICBDYWxsIHRoZSBOUENsYXNzIEhhc1Byb3BlcnR5IGZ1bmN0aW9uLgorICAgICAgICAK KyAgICAgICAgKFdlYktpdDo6TlBOX1JlbGVhc2VWYXJpYW50VmFsdWUpOgorICAgICAgICBDYWxs IHJlbGVhc2VOUFZhcmlhbnRWYWx1ZS4KKworMjAxMC0wNy0xOCAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCiAK ICAgICAgICAgQWRkIE5QSlNPYmplY3RNYXAgY2xhc3MKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3RNYXAuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvTlBKU09iamVjdE1hcC5jcHAKaW5kZXggZjg4N2ViNmRhYWVjY2IyMjU2MGFmN2NiNGU2 NTJjNTI1NjA0MDE5My4uZjQ2Mzk5M2VjYjViNjJlYWExZTFhZWFmNGY0YmI0ZjBmZjZlYzI2NSAx MDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTlBKU09iamVjdE1hcC5jcHAK KysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTlBKU09iamVjdE1hcC5jcHAKQEAgLTI2 LDEyICsyNiwxNiBAQAogI2luY2x1ZGUgIk5QSlNPYmplY3RNYXAuaCIKIAogI2luY2x1ZGUgIk5Q UnVudGltZVV0aWxpdGllcy5oIgorI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKKyNpbmNsdWRlIDxX ZWJDb3JlL0ZyYW1lLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9JZGVudGlmaWVyUmVwLmg+CiAjaW5j bHVkZSA8SmF2YVNjcmlwdENvcmUvSlNPYmplY3QuaD4KICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29y ZS9Qcm90ZWN0Lmg+CiAjaW5jbHVkZSA8V2ViS2l0L25wcnVudGltZS5oPgogI2luY2x1ZGUgPHd0 Zi9Ob25jb3B5YWJsZS5oPgogCiB1c2luZyBuYW1lc3BhY2UgSlNDOwordXNpbmcgbmFtZXNwYWNl IFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC02MiwxMCArNjYsMTUgQEAgcHJp dmF0ZToKIAogICAgIHZvaWQgaW5pdGlhbGl6ZShOUEpTT2JqZWN0TWFwKiwgSlNPYmplY3QqIGpz T2JqZWN0KTsKIAorICAgIGJvb2wgaGFzUHJvcGVydHkoTlBJZGVudGlmaWVyKTsKKyAgICBib29s IGdldFByb3BlcnR5KE5QSWRlbnRpZmllciwgTlBWYXJpYW50KiByZXN1bHQpOworCiAgICAgc3Rh dGljIE5QQ2xhc3MqIG5wQ2xhc3MoKTsKICAgICBzdGF0aWMgTlBPYmplY3QqIE5QX0FsbG9jYXRl KE5QUCwgTlBDbGFzcyopOwogICAgIHN0YXRpYyB2b2lkIE5QX0RlYWxsb2NhdGUoTlBPYmplY3Qq KTsKLQorICAgIHN0YXRpYyBib29sIE5QX0hhc1Byb3BlcnR5KE5QT2JqZWN0ICpucG9iaiwgTlBJ ZGVudGlmaWVyIG5hbWUpOworICAgIHN0YXRpYyBib29sIE5QX0dldFByb3BlcnR5KE5QT2JqZWN0 ICpucG9iaiwgTlBJZGVudGlmaWVyIG5hbWUsIE5QVmFyaWFudCAqcmVzdWx0KTsKKyAgICAKICAg ICBOUEpTT2JqZWN0TWFwKiBtX29iamVjdE1hcDsKICAgICBQcm90ZWN0ZWRQdHI8SlNPYmplY3Q+ IG1fanNPYmplY3Q7CiB9OwpAQCAtOTIsNiArMTAxLDQyIEBAIHZvaWQgTlBKU09iamVjdDo6aW5p dGlhbGl6ZShOUEpTT2JqZWN0TWFwKiBvYmplY3RNYXAsIEpTT2JqZWN0KiBqc09iamVjdCkKICAg ICBtX2pzT2JqZWN0ID0ganNPYmplY3Q7CiB9CiAKK3N0YXRpYyBJZGVudGlmaWVyIGlkZW50aWZp ZXJGcm9tSWRlbnRpZmllclJlcChFeGVjU3RhdGUqIGV4ZWMsIElkZW50aWZpZXJSZXAqIGlkZW50 aWZpZXJSZXApCit7CisgICAgQVNTRVJUKGlkZW50aWZpZXJSZXAtPmlzU3RyaW5nKCkpOworCisg ICAgY29uc3QgY2hhciAqc3RyaW5nID0gaWRlbnRpZmllclJlcC0+c3RyaW5nKCk7CisgICAgaW50 IGxlbmd0aCA9IHN0cmxlbihzdHJpbmcpOworCisgICAgcmV0dXJuIElkZW50aWZpZXIoZXhlYywg U3RyaW5nOjpmcm9tVVRGOFdpdGhMYXRpbjFGYWxsYmFjayhzdHJpbmcsIGxlbmd0aCkuaW1wbCgp KTsKK30KKworYm9vbCBOUEpTT2JqZWN0OjpoYXNQcm9wZXJ0eShOUElkZW50aWZpZXIgaWRlbnRp ZmllcikKK3sKKyAgICBJZGVudGlmaWVyUmVwKiBpZGVudGlmaWVyUmVwID0gc3RhdGljX2Nhc3Q8 SWRlbnRpZmllclJlcCo+KGlkZW50aWZpZXIpOworICAgIAorICAgIEZyYW1lKiBmcmFtZSA9IG1f b2JqZWN0TWFwLT5tX3BsdWdpblZpZXctPmZyYW1lKCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgYm9vbCByZXN1bHQ7CisgICAgRXhlY1N0YXRlKiBleGVj ID0gZnJhbWUtPnNjcmlwdCgpLT5nbG9iYWxPYmplY3QocGx1Z2luV29ybGQoKSktPmdsb2JhbEV4 ZWMoKTsKKyAgICBpZiAoaWRlbnRpZmllclJlcC0+aXNTdHJpbmcoKSkKKyAgICAgICAgcmVzdWx0 ID0gbV9qc09iamVjdC0+aGFzUHJvcGVydHkoZXhlYywgaWRlbnRpZmllckZyb21JZGVudGlmaWVy UmVwKGV4ZWMsIGlkZW50aWZpZXJSZXApKTsKKyAgICBlbHNlCisgICAgICAgIHJlc3VsdCA9IG1f anNPYmplY3QtPmhhc1Byb3BlcnR5KGV4ZWMsIGlkZW50aWZpZXJSZXAtPm51bWJlcigpKTsKKwor ICAgIGV4ZWMtPmNsZWFyRXhjZXB0aW9uKCk7CisKKyAgICByZXR1cm4gcmVzdWx0OworfQorCiti b29sIE5QSlNPYmplY3Q6OmdldFByb3BlcnR5KE5QSWRlbnRpZmllciBpZGVudGlmaWVyLCBOUFZh cmlhbnQqIHJlc3VsdCkKK3sKKyAgICAvLyBGSVhNRTogSW1wbGVtZW50LgorICAgIHJldHVybiBm YWxzZTsKK30KKwogTlBDbGFzcyogTlBKU09iamVjdDo6bnBDbGFzcygpCiB7CiAgICAgc3RhdGlj IE5QQ2xhc3MgbnBDbGFzcyA9IHsKQEAgLTEwMiw4ICsxNDcsOCBAQCBOUENsYXNzKiBOUEpTT2Jq ZWN0OjpucENsYXNzKCkKICAgICAgICAgMCwKICAgICAgICAgMCwKICAgICAgICAgMCwKLSAgICAg ICAgMCwKLSAgICAgICAgMCwKKyAgICAgICAgTlBfSGFzUHJvcGVydHksCisgICAgICAgIE5QX0dl dFByb3BlcnR5LAogICAgICAgICAwLAogICAgICAgICAwLAogICAgICAgICAwLApAQCAtMTI2LDYg KzE3MSwxNiBAQCB2b2lkIE5QSlNPYmplY3Q6Ok5QX0RlYWxsb2NhdGUoTlBPYmplY3QqIG5wT2Jq ZWN0KQogICAgIGRlbGV0ZSBucEpTT2JqZWN0OwogfQogCitib29sIE5QSlNPYmplY3Q6Ok5QX0hh c1Byb3BlcnR5KE5QT2JqZWN0ICpucE9iamVjdCwgTlBJZGVudGlmaWVyIHByb3BlcnR5TmFtZSkK K3sKKyAgICByZXR1cm4gdG9OUEpTT2JqZWN0KG5wT2JqZWN0KS0+aGFzUHJvcGVydHkocHJvcGVy dHlOYW1lKTsKK30KKyAgICAKK2Jvb2wgTlBKU09iamVjdDo6TlBfR2V0UHJvcGVydHkoTlBPYmpl Y3QgKm5wT2JqZWN0LCBOUElkZW50aWZpZXIgcHJvcGVydHlOYW1lLCBOUFZhcmlhbnQgKnJlc3Vs dCkKK3sKKyAgICByZXR1cm4gdG9OUEpTT2JqZWN0KG5wT2JqZWN0KS0+Z2V0UHJvcGVydHkocHJv cGVydHlOYW1lLCByZXN1bHQpOworfQorCiBOUEpTT2JqZWN0TWFwOjpOUEpTT2JqZWN0TWFwKFBs dWdpblZpZXcqIHBsdWdpblZpZXcpCiAgICAgOiBtX3BsdWdpblZpZXcocGx1Z2luVmlldykKIHsK ZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZVV0aWxpdGll cy5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OUFJ1bnRpbWVVdGlsaXRpZXMuY3Bw CmluZGV4IDRiYWQ4MzAyNDhlZWYwYmViMzBhNzAzNjkzOTE5NDkwMDc3ODlmM2QuLjNiM2VjZWNi ODQ5OTBjYjdhNTM1ZmE5NTNjMzJjNmIyYzE2ODE0MTkgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZVV0aWxpdGllcy5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvTlBSdW50aW1lVXRpbGl0aWVzLmNwcApAQCAtODEsNSArODEsMzIgQEAg dm9pZCByZWxlYXNlTlBPYmplY3QoTlBPYmplY3QqIG5wT2JqZWN0KQogICAgIGlmICghbnBPYmpl Y3QtPnJlZmVyZW5jZUNvdW50KQogICAgICAgICBkZWFsbG9jYXRlTlBPYmplY3QobnBPYmplY3Qp OwogfQorCit2b2lkIHJlbGVhc2VOUFZhcmlhbnRWYWx1ZShOUFZhcmlhbnQqIHZhcmlhbnQpCit7 CisgICAgQVNTRVJUKHZhcmlhbnQpOwogICAgIAorICAgIHN3aXRjaCAodmFyaWFudC0+dHlwZSkg eworICAgIGNhc2UgTlBWYXJpYW50VHlwZV9Wb2lkOgorICAgIGNhc2UgTlBWYXJpYW50VHlwZV9O dWxsOgorICAgIGNhc2UgTlBWYXJpYW50VHlwZV9Cb29sOgorICAgIGNhc2UgTlBWYXJpYW50VHlw ZV9JbnQzMjoKKyAgICBjYXNlIE5QVmFyaWFudFR5cGVfRG91YmxlOgorICAgICAgICAvLyBOb3Ro aW5nIHRvIGRvLgorICAgICAgICBicmVhazsKKyAgICAgICAgCisgICAgY2FzZSBOUFZhcmlhbnRU eXBlX1N0cmluZzoKKyAgICAgICAgZnJlZShjb25zdF9jYXN0PE5QVVRGOCo+KHZhcmlhbnQtPnZh bHVlLnN0cmluZ1ZhbHVlLlVURjhDaGFyYWN0ZXJzKSk7CisgICAgICAgIHZhcmlhbnQtPnZhbHVl LnN0cmluZ1ZhbHVlLlVURjhDaGFyYWN0ZXJzID0gMDsKKyAgICAgICAgdmFyaWFudC0+dmFsdWUu c3RyaW5nVmFsdWUuVVRGOExlbmd0aCA9IDA7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTlBW YXJpYW50VHlwZV9PYmplY3Q6CisgICAgICAgIHJlbGVhc2VOUE9iamVjdCh2YXJpYW50LT52YWx1 ZS5vYmplY3RWYWx1ZSk7CisgICAgICAgIHZhcmlhbnQtPnZhbHVlLm9iamVjdFZhbHVlID0gMDsK KyAgICAgICAgYnJlYWs7CisgICAgfQorCisgICAgdmFyaWFudC0+dHlwZSA9IE5QVmFyaWFudFR5 cGVfVm9pZDsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9OUFJ1bnRpbWVVdGlsaXRpZXMuaCBiL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL05QUnVudGltZVV0aWxpdGllcy5oCmluZGV4IGRlYTQ1ZjUxYTJlNjY1Mzc2 OGEzNDQ1NTRmZTU2ZjUwYTVhNjYxNGMuLmIyOTMwYjMyMTdhODkwYWUwYzBmN2UyNmQzNGMzMDI5 NGFkMjA4OTggMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGlt ZVV0aWxpdGllcy5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZVV0 aWxpdGllcy5oCkBAIC0zOSw2ICszOSw4IEBAIHZvaWQgZGVhbGxvY2F0ZU5QT2JqZWN0KE5QT2Jq ZWN0Kik7CiB2b2lkIHJldGFpbk5QT2JqZWN0KE5QT2JqZWN0Kik7CiB2b2lkIHJlbGVhc2VOUE9i amVjdChOUE9iamVjdCopOwogCit2b2lkIHJlbGVhc2VOUFZhcmlhbnRWYWx1ZShOUFZhcmlhbnQq KTsKKwogfQogCiAjZW5kaWYgLy8gTlBSdW50aW1lVXRpbGl0aWVzX2gKZGlmZiAtLWdpdCBhL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNw cCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1 bmNzLmNwcAppbmRleCAxZDdiMDU1MDA0ZTZhMjg5Y2JhNDI4NzY1MjIxMjIzNmJmMjEzNzg3Li4w YWY5YjU3YjI2ZmYyNzU0NmIyZjY0ZDkwNGRjNjYyMTg2OTczZTdjIDEwMDY0NAotLS0gYS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZUJyb3dzZXJGdW5jcy5jcHAK KysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2Vy RnVuY3MuY3BwCkBAIC0zMTAsOSArMzEwLDE0IEBAIHN0YXRpYyBib29sIE5QTl9FdmFsdWF0ZShO UFAgbnBwLCBOUE9iamVjdCAqbnBvYmosIE5QU3RyaW5nICpzY3JpcHQsIE5QVmFyaWFudCAqCiAg ICAgcmV0dXJuIGZhbHNlOwogfQogCi1zdGF0aWMgYm9vbCBOUE5fR2V0UHJvcGVydHkoTlBQIG5w cCwgTlBPYmplY3QgKm5wb2JqLCBOUElkZW50aWZpZXIgcHJvcGVydHlOYW1lLCBOUFZhcmlhbnQg KnJlc3VsdCkKK3N0YXRpYyBib29sIE5QTl9HZXRQcm9wZXJ0eShOUFAgbnBwLCBOUE9iamVjdCAq bnBPYmplY3QsIE5QSWRlbnRpZmllciBwcm9wZXJ0eU5hbWUsIE5QVmFyaWFudCAqcmVzdWx0KQog ewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgaWYgKG5wT2JqZWN0LT5fY2xhc3MtPmhhc1By b3BlcnR5ICYmIG5wT2JqZWN0LT5fY2xhc3MtPmdldFByb3BlcnR5KSB7CisgICAgICAgIGlmIChu cE9iamVjdC0+X2NsYXNzLT5oYXNQcm9wZXJ0eShucE9iamVjdCwgcHJvcGVydHlOYW1lKSkKKyAg ICAgICAgICAgIHJldHVybiBucE9iamVjdC0+X2NsYXNzLT5nZXRQcm9wZXJ0eShucE9iamVjdCwg cHJvcGVydHlOYW1lLCByZXN1bHQpOworICAgIH0KKyAgICAKKyAgICBWT0lEX1RPX05QVkFSSUFO VCgqcmVzdWx0KTsKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKQEAgLTMyOCw5ICszMzMsMTEgQEAg c3RhdGljIGJvb2wgTlBOX1JlbW92ZVByb3BlcnR5KE5QUCBucHAsIE5QT2JqZWN0ICpucG9iaiwg TlBJZGVudGlmaWVyIHByb3BlcnR5TmEKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyBi b29sIE5QTl9IYXNQcm9wZXJ0eShOUFAgbnBwLCBOUE9iamVjdCAqbnBvYmosIE5QSWRlbnRpZmll ciBwcm9wZXJ0eU5hbWUpCitzdGF0aWMgYm9vbCBOUE5fSGFzUHJvcGVydHkoTlBQIG5wcCwgTlBP YmplY3QgKm5wT2JqZWN0LCBOUElkZW50aWZpZXIgcHJvcGVydHlOYW1lKQogewotICAgIG5vdElt cGxlbWVudGVkKCk7CisgICAgaWYgKG5wT2JqZWN0LT5fY2xhc3MtPmhhc1Byb3BlcnR5KQorICAg ICAgICByZXR1cm4gbnBPYmplY3QtPl9jbGFzcy0+aGFzUHJvcGVydHkobnBPYmplY3QsIHByb3Bl cnR5TmFtZSk7CisKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKQEAgLTM0Miw3ICszNDksNyBAQCBz dGF0aWMgYm9vbCBOUE5fSGFzTWV0aG9kKE5QUCBucHAsIE5QT2JqZWN0ICpucG9iaiwgTlBJZGVu dGlmaWVyIG1ldGhvZE5hbWUpCiAKIHN0YXRpYyB2b2lkIE5QTl9SZWxlYXNlVmFyaWFudFZhbHVl KE5QVmFyaWFudCAqdmFyaWFudCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIHJlbGVh c2VOUFZhcmlhbnRWYWx1ZSh2YXJpYW50KTsKIH0KIAogc3RhdGljIHZvaWQgTlBOX1NldEV4Y2Vw dGlvbihOUE9iamVjdCAqbnBvYmosIGNvbnN0IE5QVVRGOCAqbWVzc2FnZSkK