43165 2010-07-28 18:08:03 -0700 Add JSNPObject::getConstructData 2010-07-29 12:32:06 -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 257500 0 andersca 2010-07-28 18:08:03 -0700 Add JSNPObject::getConstructData 257503 1 62907 andersca 2010-07-28 18:12:10 -0700 Created attachment 62907 Patch 257505 2 webkit.review.bot 2010-07-28 18:13:35 -0700 Attachment 62907 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/Plugins/NPJSObject.h:34: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 257808 3 andersca 2010-07-29 12:32:06 -0700 Committed r64300: <http://trac.webkit.org/changeset/64300> 62907 2010-07-28 18:12:10 -0700 2010-07-28 18:26:01 -0700 Patch bug-43165-20100728181209.patch text/plain 13666 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg OTFlOWQyNDZjYjRhOWQ0Y2MwZjVkYWZmYTVkZTAwNzIwMGMzODMyZi4uZjhkZjYxNTYwMmQ0NTRj NGJjNDQ3NWI3ZjcwYzlhODBhOTQ1YWY1NSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0NiBAQAogMjAxMC0wNy0yOCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBKU05QT2JqZWN0OjpnZXRDb25zdHJ1Y3RE YXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MzE2 NQorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL0pTTlBPYmplY3QuY3BwOgorICAgICAg ICAoV2ViS2l0OjpKU05QT2JqZWN0OjpjYWxsTWV0aG9kKToKKyAgICAgICAgQWRkIGEgbnVsbCBj aGVjayBmb3IgbV9ucE9iamVjdC4KKyAgICAgICAgCisgICAgICAgIChXZWJLaXQ6OkpTTlBPYmpl Y3Q6OmNhbGxDb25zdHJ1Y3Rvcik6CisgICAgICAgIENhbGwgTlBDbGFzczo6Y29uc3RydWN0Lgor CisgICAgICAgIChXZWJLaXQ6OkpTTlBPYmplY3Q6OmdldENvbnN0cnVjdERhdGEpOgorICAgICAg ICBTZXQgdXAgdGhlIGNvbnN0cnVjdCBkYXRhLgorCisgICAgICAgIChXZWJLaXQ6OkpTTlBPYmpl Y3Q6OnByb3BlcnR5R2V0dGVyKToKKyAgICAgICAgY29udmVydE5QVmFyaWFudFRvSlNWYWx1ZSBu b3cgdGFrZXMgYSBKU0dsb2JhbE9iamVjdCBhcyB3ZWxsLgorICAgICAgICAKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1BsdWdpbnMvTlBKU09iamVjdC5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5QSlNP YmplY3Q6Omludm9rZSk6CisgICAgICAgIChXZWJLaXQ6Ok5QSlNPYmplY3Q6Omludm9rZURlZmF1 bHQpOgorICAgICAgICAoV2ViS2l0OjpOUEpTT2JqZWN0Ojpjb25zdHJ1Y3QpOgorICAgICAgICBj b252ZXJ0TlBWYXJpYW50VG9KU1ZhbHVlIG5vdyB0YWtlcyBhIEpTR2xvYmFsT2JqZWN0IGFzIHdl bGwuCisgICAgICAgIAorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OUEpTT2JqZWN0Lmg6 CisgICAgICAgIE1ha2UgaXNOUEpTT2JqZWN0IGFuZCB0b05QSlNPYmplY3QgcHVibGljLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZU9iamVjdE1hcC5jcHA6CisgICAg ICAgIChXZWJLaXQ6Ok5QUnVudGltZU9iamVjdE1hcDo6Y29udmVydE5QVmFyaWFudFRvSlNWYWx1 ZSk6CisgICAgICAgIENvbnZlcnQgTlBPYmplY3RzIGNvcnJlY3RseS4KKyAgICAgICAgCisgICAg ICAgIChXZWJLaXQ6Ok5QUnVudGltZU9iamVjdE1hcDo6Z2xvYmFsT2JqZWN0KToKKyAgICAgICAg R2V0IHRoZSBnbG9iYWxPYmplY3QgZnJvbSB0aGUgZnJhbWUuCisKKyAgICAgICAgKFdlYktpdDo6 TlBSdW50aW1lT2JqZWN0TWFwOjpnbG9iYWxFeGVjKToKKyAgICAgICAgQ2FsbCBnbG9iYWxPYmpl Y3QuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTlBSdW50aW1lT2JqZWN0TWFwLmg6 CisKKzIwMTAtMDctMjggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwog ICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgogCiAgICAgICAgIEltcGxlbWVudCBOUE5f SW52b2tlRGVmYXVsdCBhbmQgTlBOX0NvbnN0cnVjdApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvSlNOUE9iamVjdC5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9KU05QT2JqZWN0LmNwcAppbmRleCAyMjk2NjA3NmEzZjRjYTc3NThhNWVlYWFmZDA0NjI0Y2Y4 ZWM0OTg2Li5iYWZiNTRiMGEwM2UzODJlZmUyNGUzZTA5N2I2YTFiOGZmZGRkYTZlIDEwMDY0NAot LS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9KU05QT2JqZWN0LmNwcAorKysgYi9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9KU05QT2JqZWN0LmNwcApAQCAtNjEsOCArNjEsOCBAQCBK U05QT2JqZWN0Ojp+SlNOUE9iamVjdCgpCiAKIEpTVmFsdWUgSlNOUE9iamVjdDo6Y2FsbE1ldGhv ZChFeGVjU3RhdGUqIGV4ZWMsIE5QSWRlbnRpZmllciBtZXRob2ROYW1lKQogewotICAgIGlmICgh bV9ucE9iamVjdC0+X2NsYXNzLT5oYXNNZXRob2QobV9ucE9iamVjdCwgbWV0aG9kTmFtZSkpCi0g ICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOworICAgIGlmICghbV9ucE9iamVjdCkKKyAgICAg ICAgcmV0dXJuIHRocm93SW52YWxpZEFjY2Vzc0Vycm9yKGV4ZWMpOwogCiAgICAgc2l6ZV90IGFy Z3VtZW50Q291bnQgPSBleGVjLT5hcmd1bWVudENvdW50KCk7CiAgICAgVmVjdG9yPE5QVmFyaWFu dCwgOD4gYXJndW1lbnRzKGFyZ3VtZW50Q291bnQpOwpAQCAtOTAsMTEgKzkwLDYwIEBAIEpTVmFs dWUgSlNOUE9iamVjdDo6Y2FsbE1ldGhvZChFeGVjU3RhdGUqIGV4ZWMsIE5QSWRlbnRpZmllciBt ZXRob2ROYW1lKQogICAgIGlmICghcmV0dXJuVmFsdWUpCiAgICAgICAgIHRocm93RXJyb3IoZXhl YywgY3JlYXRlRXJyb3IoZXhlYywgIkVycm9yIGNhbGxpbmcgbWV0aG9kIG9uIE5QT2JqZWN0LiIp KTsKIAotICAgIEpTVmFsdWUgcHJvcGVydHlWYWx1ZSA9IG1fb2JqZWN0TWFwLT5jb252ZXJ0TlBW YXJpYW50VG9KU1ZhbHVlKGV4ZWMsIHJlc3VsdCk7CisgICAgSlNWYWx1ZSBwcm9wZXJ0eVZhbHVl ID0gbV9vYmplY3RNYXAtPmNvbnZlcnROUFZhcmlhbnRUb0pTVmFsdWUoZXhlYywgZ2xvYmFsT2Jq ZWN0KCksIHJlc3VsdCk7CiAgICAgcmVsZWFzZU5QVmFyaWFudFZhbHVlKCZyZXN1bHQpOwogICAg IHJldHVybiBwcm9wZXJ0eVZhbHVlOwogfQogCitKU1ZhbHVlIEpTTlBPYmplY3Q6OmNhbGxDb25z dHJ1Y3RvcihFeGVjU3RhdGUqIGV4ZWMpCit7CisgICAgaWYgKCFtX25wT2JqZWN0KQorICAgICAg ICByZXR1cm4gdGhyb3dJbnZhbGlkQWNjZXNzRXJyb3IoZXhlYyk7CisKKyAgICBzaXplX3QgYXJn dW1lbnRDb3VudCA9IGV4ZWMtPmFyZ3VtZW50Q291bnQoKTsKKyAgICBWZWN0b3I8TlBWYXJpYW50 LCA4PiBhcmd1bWVudHMoYXJndW1lbnRDb3VudCk7CisKKyAgICAvLyBDb252ZXJ0IGFsbCBhcmd1 bWVudHMgdG8gTlBWYXJpYW50cy4KKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGFyZ3VtZW50 Q291bnQ7ICsraSkKKyAgICAgICAgbV9vYmplY3RNYXAtPmNvbnZlcnRKU1ZhbHVlVG9OUFZhcmlh bnQoZXhlYywgZXhlYy0+YXJndW1lbnQoaSksIGFyZ3VtZW50c1tpXSk7CisKKyAgICBib29sIHJl dHVyblZhbHVlOworICAgIE5QVmFyaWFudCByZXN1bHQ7CisgICAgVk9JRF9UT19OUFZBUklBTlQo cmVzdWx0KTsKKyAgICAKKyAgICB7CisgICAgICAgIEpTTG9jazo6RHJvcEFsbExvY2tzIGRyb3BB bGxMb2NrcyhTaWxlbmNlQXNzZXJ0aW9uc09ubHkpOworICAgICAgICByZXR1cm5WYWx1ZSA9IG1f bnBPYmplY3QtPl9jbGFzcy0+Y29uc3RydWN0KG1fbnBPYmplY3QsIGFyZ3VtZW50cy5kYXRhKCks IGFyZ3VtZW50Q291bnQsICZyZXN1bHQpOworCisgICAgICAgIC8vIEZJWE1FOiBIYW5kbGUgY29u c3RydWN0IHNldHRpbmcgYW4gZXhjZXB0aW9uLgorICAgICAgICAvLyBGSVhNRTogRmluZCBvdXQg d2hhdCBoYXBwZW5zIGlmIGNhbGxpbmcgY29uc3RydWN0IGNhdXNlcyB0aGUgcGx1Zy1pbiB0byBn byBhd2F5LgorICAgIH0KKworICAgIGlmICghcmV0dXJuVmFsdWUpCisgICAgICAgIHRocm93RXJy b3IoZXhlYywgY3JlYXRlRXJyb3IoZXhlYywgIkVycm9yIGNhbGxpbmcgbWV0aG9kIG9uIE5QT2Jq ZWN0LiIpKTsKKyAgICAKKyAgICBKU1ZhbHVlIHZhbHVlID0gbV9vYmplY3RNYXAtPmNvbnZlcnRO UFZhcmlhbnRUb0pTVmFsdWUoZXhlYywgZ2xvYmFsT2JqZWN0KCksIHJlc3VsdCk7CisgICAgcmVs ZWFzZU5QVmFyaWFudFZhbHVlKCZyZXN1bHQpOworICAgIHJldHVybiB2YWx1ZTsKK30KKworc3Rh dGljIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgY29uc3RydWN0V2l0aENvbnN0cnVjdG9y KEV4ZWNTdGF0ZSogZXhlYykKK3sKKyAgICBKU09iamVjdCogY29uc3RydWN0b3IgPSBleGVjLT5j YWxsZWUoKTsKKyAgICBBU1NFUlQoY29uc3RydWN0b3ItPmluaGVyaXRzKCZKU05QT2JqZWN0Ojpz X2luZm8pKTsKKworICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoc3RhdGljX2Nhc3Q8SlNOUE9i amVjdCo+KGNvbnN0cnVjdG9yKS0+Y2FsbENvbnN0cnVjdG9yKGV4ZWMpKTsKK30KKworQ29uc3Ry dWN0VHlwZSBKU05QT2JqZWN0OjpnZXRDb25zdHJ1Y3REYXRhKENvbnN0cnVjdERhdGEmIGNvbnN0 cnVjdERhdGEpCit7CisgICAgaWYgKCFtX25wT2JqZWN0IHx8ICFtX25wT2JqZWN0LT5fY2xhc3Mt PmNvbnN0cnVjdCkKKyAgICAgICAgcmV0dXJuIENvbnN0cnVjdFR5cGVOb25lOworCisgICAgY29u c3RydWN0RGF0YS5uYXRpdmUuZnVuY3Rpb24gPSBjb25zdHJ1Y3RXaXRoQ29uc3RydWN0b3I7Cisg ICAgcmV0dXJuIENvbnN0cnVjdFR5cGVIb3N0OworfQorCiBib29sIEpTTlBPYmplY3Q6OmdldE93 blByb3BlcnR5U2xvdChFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5 TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQogewogICAgIGlmICghbV9ucE9iamVjdCkgewpAQCAt MjA0LDcgKzI1Myw3IEBAIEpTVmFsdWUgSlNOUE9iamVjdDo6cHJvcGVydHlHZXR0ZXIoRXhlY1N0 YXRlKiBleGVjLCBKU1ZhbHVlIHNsb3RCYXNlLCBjb25zdCBJZGVuCiAgICAgaWYgKCFyZXR1cm5W YWx1ZSkKICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CiAKLSAgICBKU1ZhbHVlIHByb3Bl cnR5VmFsdWUgPSB0aGlzT2JqLT5tX29iamVjdE1hcC0+Y29udmVydE5QVmFyaWFudFRvSlNWYWx1 ZShleGVjLCByZXN1bHQpOworICAgIEpTVmFsdWUgcHJvcGVydHlWYWx1ZSA9IHRoaXNPYmotPm1f b2JqZWN0TWFwLT5jb252ZXJ0TlBWYXJpYW50VG9KU1ZhbHVlKGV4ZWMsIHRoaXNPYmotPmdsb2Jh bE9iamVjdCgpLCByZXN1bHQpOwogICAgIHJlbGVhc2VOUFZhcmlhbnRWYWx1ZSgmcmVzdWx0KTsK ICAgICByZXR1cm4gcHJvcGVydHlWYWx1ZTsKIH0KZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL0pTTlBPYmplY3QuaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL0pT TlBPYmplY3QuaAppbmRleCAxMzQ1YWJiMWY5NGYxODc1ZGU1MDQwZDNkN2JlNjJmZmZkZDM4YTdh Li45YzlkYmEwODMxMWM5Y2EyZDk1M2E0NTUwYjVhMjA2MGNlOGExNWZiIDEwMDY0NAotLS0gYS9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9KU05QT2JqZWN0LmgKKysrIGIvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvSlNOUE9iamVjdC5oCkBAIC00Myw2ICs0Myw3IEBAIHB1YmxpYzoKICAg ICB+SlNOUE9iamVjdCgpOwogCiAgICAgSlNDOjpKU1ZhbHVlIGNhbGxNZXRob2QoSlNDOjpFeGVj U3RhdGUqLCBOUElkZW50aWZpZXIgbWV0aG9kTmFtZSk7CisgICAgSlNDOjpKU1ZhbHVlIGNhbGxD b25zdHJ1Y3RvcihKU0M6OkV4ZWNTdGF0ZSopOwogCiAgICAgc3RhdGljIGNvbnN0IEpTQzo6Q2xh c3NJbmZvIHNfaW5mbzsKIApAQCAtNTQsNiArNTUsOCBAQCBwcml2YXRlOgogICAgICAgICByZXR1 cm4gSlNDOjpTdHJ1Y3R1cmU6OmNyZWF0ZShwcm90b3R5cGUsIEpTQzo6VHlwZUluZm8oSlNDOjpP YmplY3RUeXBlLCBTdHJ1Y3R1cmVGbGFncyksIEFub255bW91c1Nsb3RDb3VudCk7CiAgICAgfQog CisgICAgdmlydHVhbCBKU0M6OkNvbnN0cnVjdFR5cGUgZ2V0Q29uc3RydWN0RGF0YShKU0M6OkNv bnN0cnVjdERhdGEmKTsKKwogICAgIHZpcnR1YWwgYm9vbCBnZXRPd25Qcm9wZXJ0eVNsb3QoSlND OjpFeGVjU3RhdGUqLCBjb25zdCBKU0M6OklkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgSlNDOjpQ cm9wZXJ0eVNsb3QmKTsKICAgICB2aXJ0dWFsIGJvb2wgZ2V0T3duUHJvcGVydHlEZXNjcmlwdG9y KEpTQzo6RXhlY1N0YXRlKiwgY29uc3QgSlNDOjpJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIEpT Qzo6UHJvcGVydHlEZXNjcmlwdG9yJik7CiAgICAgdmlydHVhbCB2b2lkIHB1dChKU0M6OkV4ZWNT dGF0ZSosIGNvbnN0IEpTQzo6SWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBKU0M6OkpTVmFsdWUs IEpTQzo6UHV0UHJvcGVydHlTbG90Jik7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9OUEpTT2JqZWN0LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNP YmplY3QuY3BwCmluZGV4IDQ2YWViNzkzMTI4ZDBiMTZkMzM2MDVjMDAyZjljMDhhM2NmY2Y2NjIu LjJlYWRmYmNiM2ZiMDdkNGE3YzQyMDhmZTBkY2Y0MzA5YTM2MjY5ZTUgMTAwNjQ0Ci0tLSBhL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuY3BwCisrKyBiL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuY3BwCkBAIC0xMTYsNyArMTE2LDcgQEAgYm9vbCBO UEpTT2JqZWN0OjppbnZva2UoTlBJZGVudGlmaWVyIG1ldGhvZE5hbWUsIGNvbnN0IE5QVmFyaWFu dCogYXJndW1lbnRzLCB1aW4KICAgICBKU0xvY2sgbG9jayhTaWxlbmNlQXNzZXJ0aW9uc09ubHkp OwogCiAgICAgSlNWYWx1ZSBmdW5jdGlvbiA9IG1fanNPYmplY3QtPmdldChleGVjLCBpZGVudGlm aWVyRnJvbUlkZW50aWZpZXJSZXAoZXhlYywgaWRlbnRpZmllclJlcCkpOwotICAgIHJldHVybiBp bnZva2UoZXhlYywgZnVuY3Rpb24sIGFyZ3VtZW50cywgYXJndW1lbnRDb3VudCwgcmVzdWx0KTsK KyAgICByZXR1cm4gaW52b2tlKGV4ZWMsIG1fb2JqZWN0TWFwLT5nbG9iYWxPYmplY3QoKSwgZnVu Y3Rpb24sIGFyZ3VtZW50cywgYXJndW1lbnRDb3VudCwgcmVzdWx0KTsKIH0KIAogYm9vbCBOUEpT T2JqZWN0OjppbnZva2VEZWZhdWx0KGNvbnN0IE5QVmFyaWFudCAqYXJndW1lbnRzLCB1aW50MzJf dCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQgKnJlc3VsdCkKQEAgLTEyOCw3ICsxMjgsNyBAQCBi b29sIE5QSlNPYmplY3Q6Omludm9rZURlZmF1bHQoY29uc3QgTlBWYXJpYW50ICphcmd1bWVudHMs IHVpbnQzMl90IGFyZ3VtZW50Q291bgogICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25z T25seSk7CiAKICAgICBKU1ZhbHVlIGZ1bmN0aW9uID0gbV9qc09iamVjdDsKLSAgICByZXR1cm4g aW52b2tlKGV4ZWMsIGZ1bmN0aW9uLCBhcmd1bWVudHMsIGFyZ3VtZW50Q291bnQsIHJlc3VsdCk7 CisgICAgcmV0dXJuIGludm9rZShleGVjLCBtX29iamVjdE1hcC0+Z2xvYmFsT2JqZWN0KCksIGZ1 bmN0aW9uLCBhcmd1bWVudHMsIGFyZ3VtZW50Q291bnQsIHJlc3VsdCk7CiB9CiAKIGJvb2wgTlBK U09iamVjdDo6aGFzUHJvcGVydHkoTlBJZGVudGlmaWVyIGlkZW50aWZpZXIpCkBAIC0xODcsNyAr MTg3LDcgQEAgYm9vbCBOUEpTT2JqZWN0Ojpjb25zdHJ1Y3QoY29uc3QgTlBWYXJpYW50ICphcmd1 bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50Q291bnQsIE4KICAgICAvLyBDb252ZXJ0IHRoZSBwYXNz ZWQgaW4gYXJndW1lbnRzLgogICAgIE1hcmtlZEFyZ3VtZW50QnVmZmVyIGFyZ3VtZW50TGlzdDsK ICAgICBmb3IgKHVpbnQzMl90IGkgPSAwOyBpIDwgYXJndW1lbnRDb3VudDsgKytpKQotICAgICAg ICBhcmd1bWVudExpc3QuYXBwZW5kKG1fb2JqZWN0TWFwLT5jb252ZXJ0TlBWYXJpYW50VG9KU1Zh bHVlKGV4ZWMsIGFyZ3VtZW50c1tpXSkpOworICAgICAgICBhcmd1bWVudExpc3QuYXBwZW5kKG1f b2JqZWN0TWFwLT5jb252ZXJ0TlBWYXJpYW50VG9KU1ZhbHVlKGV4ZWMsIG1fb2JqZWN0TWFwLT5n bG9iYWxPYmplY3QoKSwgYXJndW1lbnRzW2ldKSk7CiAKICAgICBleGVjLT5nbG9iYWxEYXRhKCku dGltZW91dENoZWNrZXIuc3RhcnQoKTsKICAgICBKU1ZhbHVlIHZhbHVlID0gSlNDOjpjb25zdHJ1 Y3QoZXhlYywgbV9qc09iamVjdCwgY29uc3RydWN0VHlwZSwgY29uc3RydWN0RGF0YSwgYXJndW1l bnRMaXN0KTsKQEAgLTIwMCw3ICsyMDAsNyBAQCBib29sIE5QSlNPYmplY3Q6OmNvbnN0cnVjdChj b25zdCBOUFZhcmlhbnQgKmFyZ3VtZW50cywgdWludDMyX3QgYXJndW1lbnRDb3VudCwgTgogICAg IHJldHVybiB0cnVlOwogfQogCi1ib29sIE5QSlNPYmplY3Q6Omludm9rZShFeGVjU3RhdGUqIGV4 ZWMsIEpTVmFsdWUgZnVuY3Rpb24sIGNvbnN0IE5QVmFyaWFudCogYXJndW1lbnRzLCB1aW50MzJf dCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQqIHJlc3VsdCkKK2Jvb2wgTlBKU09iamVjdDo6aW52 b2tlKEV4ZWNTdGF0ZSogZXhlYywgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSlNWYWx1 ZSBmdW5jdGlvbiwgY29uc3QgTlBWYXJpYW50KiBhcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50 Q291bnQsIE5QVmFyaWFudCogcmVzdWx0KQogewogICAgIENhbGxEYXRhIGNhbGxEYXRhOwogICAg IENhbGxUeXBlIGNhbGxUeXBlID0gZ2V0Q2FsbERhdGEoZnVuY3Rpb24sIGNhbGxEYXRhKTsKQEAg LTIxMCw3ICsyMTAsNyBAQCBib29sIE5QSlNPYmplY3Q6Omludm9rZShFeGVjU3RhdGUqIGV4ZWMs IEpTVmFsdWUgZnVuY3Rpb24sIGNvbnN0IE5QVmFyaWFudCogYXJndQogICAgIC8vIENvbnZlcnQg dGhlIHBhc3NlZCBpbiBhcmd1bWVudHMuCiAgICAgTWFya2VkQXJndW1lbnRCdWZmZXIgYXJndW1l bnRMaXN0OwogICAgIGZvciAodWludDMyX3QgaSA9IDA7IGkgPCBhcmd1bWVudENvdW50OyArK2kp Ci0gICAgICAgIGFyZ3VtZW50TGlzdC5hcHBlbmQobV9vYmplY3RNYXAtPmNvbnZlcnROUFZhcmlh bnRUb0pTVmFsdWUoZXhlYywgYXJndW1lbnRzW2ldKSk7CisgICAgICAgIGFyZ3VtZW50TGlzdC5h cHBlbmQobV9vYmplY3RNYXAtPmNvbnZlcnROUFZhcmlhbnRUb0pTVmFsdWUoZXhlYywgZ2xvYmFs T2JqZWN0LCBhcmd1bWVudHNbaV0pKTsKIAogICAgIGV4ZWMtPmdsb2JhbERhdGEoKS50aW1lb3V0 Q2hlY2tlci5zdGFydCgpOwogICAgIEpTVmFsdWUgdmFsdWUgPSBKU0M6OmNhbGwoZXhlYywgZnVu Y3Rpb24sIGNhbGxUeXBlLCBjYWxsRGF0YSwgbV9qc09iamVjdCwgYXJndW1lbnRMaXN0KTsKZGlm ZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuaCBiL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QSlNPYmplY3QuaAppbmRleCBjOTg0M2M3MWEyNGFiN2E3 ZmQ5NGRhNDIzY2Q0YjY3MDA0NGY1N2NmLi41NTRmOTRhMWFlZmNlYWU4MjdkZjQ5MjRhZjk4NTRk NjIwZDhmMTVhIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OUEpTT2Jq ZWN0LmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTlBKU09iamVjdC5oCkBAIC0z MSw2ICszMSw3IEBACiAjaW5jbHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+CiAKIG5hbWVzcGFjZSBK U0MgeworICAgIGNsYXNzIEpTR2xvYmFsT2JqZWN0OwogICAgIGNsYXNzIEpTT2JqZWN0OwogfQog CkBAIC00NSwxMCArNDYsNiBAQCBwdWJsaWM6CiAKICAgICBKU0M6OkpTT2JqZWN0KiBqc09iamVj dCgpIGNvbnN0IHsgcmV0dXJuIG1fanNPYmplY3QuZ2V0KCk7IH0KIAotcHJpdmF0ZToKLSAgICBO UEpTT2JqZWN0KCk7Ci0gICAgfk5QSlNPYmplY3QoKTsKLQogICAgIHN0YXRpYyBib29sIGlzTlBK U09iamVjdChOUE9iamVjdCopOwogCiAgICAgc3RhdGljIE5QSlNPYmplY3QqIHRvTlBKU09iamVj dChOUE9iamVjdCogbnBPYmplY3QpCkBAIC01Nyw2ICs1NCwxMCBAQCBwcml2YXRlOgogICAgICAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8TlBKU09iamVjdCo+KG5wT2JqZWN0KTsKICAgICB9CiAKK3By aXZhdGU6CisgICAgTlBKU09iamVjdCgpOworICAgIH5OUEpTT2JqZWN0KCk7CisKICAgICB2b2lk IGluaXRpYWxpemUoTlBSdW50aW1lT2JqZWN0TWFwKiwgSlNDOjpKU09iamVjdCoganNPYmplY3Qp OwogCiAgICAgYm9vbCBoYXNNZXRob2QoTlBJZGVudGlmaWVyIG1ldGhvZE5hbWUpOwpAQCAtNjYs NyArNjcsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgZ2V0UHJvcGVydHkoTlBJZGVudGlmaWVyIHBy b3BlcnR5TmFtZSwgTlBWYXJpYW50KiByZXN1bHQpOwogICAgIGJvb2wgY29uc3RydWN0KGNvbnN0 IE5QVmFyaWFudCogYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQq IHJlc3VsdCk7CiAKLSAgICBib29sIGludm9rZShKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1 ZSBmdW5jdGlvbiwgY29uc3QgTlBWYXJpYW50KiBhcmd1bWVudHMsIHVpbnQzMl90IGFyZ3VtZW50 Q291bnQsIE5QVmFyaWFudCogcmVzdWx0KTsKKyAgICBib29sIGludm9rZShKU0M6OkV4ZWNTdGF0 ZSosIEpTQzo6SlNHbG9iYWxPYmplY3QqLCBKU0M6OkpTVmFsdWUgZnVuY3Rpb24sIGNvbnN0IE5Q VmFyaWFudCogYXJndW1lbnRzLCB1aW50MzJfdCBhcmd1bWVudENvdW50LCBOUFZhcmlhbnQqIHJl c3VsdCk7CiAKICAgICBzdGF0aWMgTlBDbGFzcyogbnBDbGFzcygpOwogICAgIHN0YXRpYyBOUE9i amVjdCogTlBfQWxsb2NhdGUoTlBQLCBOUENsYXNzKik7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9OUFJ1bnRpbWVPYmplY3RNYXAuY3BwIGIvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvTlBSdW50aW1lT2JqZWN0TWFwLmNwcAppbmRleCBiNWY5M2U5NTk4YzMzZTM2 MmEyNTM0NDk3YjM3ODBlMDBmZWIzNjcwLi5kODgxNWFmNTk0ZWJkODc1OWM3ZmQ3Zjg1NjIxY2Q2 OTA5NjNiZGE4IDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OUFJ1bnRp bWVPYmplY3RNYXAuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGlt ZU9iamVjdE1hcC5jcHAKQEAgLTc3LDcgKzc3LDcgQEAgdm9pZCBOUFJ1bnRpbWVPYmplY3RNYXA6 OmpzTlBPYmplY3REZXN0cm95ZWQoSlNOUE9iamVjdCoganNOUE9iamVjdCkKICAgICAvLyBGSVhN RTogSW1wbGVtZW50LgogfQogCi1KU1ZhbHVlIE5QUnVudGltZU9iamVjdE1hcDo6Y29udmVydE5Q VmFyaWFudFRvSlNWYWx1ZShKU0M6OkV4ZWNTdGF0ZSogZXhlYywgY29uc3QgTlBWYXJpYW50JiB2 YXJpYW50KQorSlNWYWx1ZSBOUFJ1bnRpbWVPYmplY3RNYXA6OmNvbnZlcnROUFZhcmlhbnRUb0pT VmFsdWUoSlNDOjpFeGVjU3RhdGUqIGV4ZWMsIEpTQzo6SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9i amVjdCwgY29uc3QgTlBWYXJpYW50JiB2YXJpYW50KQogewogICAgIHN3aXRjaCAodmFyaWFudC50 eXBlKSB7CiAgICAgY2FzZSBOUFZhcmlhbnRUeXBlX1ZvaWQ6CkBAIC05OCwxMiArOTgsMjAgQEAg SlNWYWx1ZSBOUFJ1bnRpbWVPYmplY3RNYXA6OmNvbnZlcnROUFZhcmlhbnRUb0pTVmFsdWUoSlND OjpFeGVjU3RhdGUqIGV4ZWMsIGNvbnMKICAgICBjYXNlIE5QVmFyaWFudFR5cGVfU3RyaW5nOgog ICAgICAgICByZXR1cm4ganNTdHJpbmcoZXhlYywgU3RyaW5nOjpmcm9tVVRGOFdpdGhMYXRpbjFG YWxsYmFjayh2YXJpYW50LnZhbHVlLnN0cmluZ1ZhbHVlLlVURjhDaGFyYWN0ZXJzLCAKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdmFyaWFudC52YWx1ZS5zdHJpbmdWYWx1ZS5VVEY4TGVuZ3RoKSk7Ci0gICAgY2FzZSBOUFZh cmlhbnRUeXBlX09iamVjdDoKLSAgICBkZWZhdWx0OgotICAgICAgICBub3RJbXBsZW1lbnRlZCgp OwotICAgICAgICBicmVhazsKKyAgICBjYXNlIE5QVmFyaWFudFR5cGVfT2JqZWN0OiB7CisgICAg ICAgIE5QT2JqZWN0KiBucE9iamVjdCA9IHZhcmlhbnQudmFsdWUub2JqZWN0VmFsdWU7CisKKyAg ICAgICAgLy8gSnVzdCBnZXQgdGhlIG9iamVjdCBmcm9tIHRoZSBOUEpTT2JqZWN0LgorICAgICAg ICBpZiAoTlBKU09iamVjdDo6aXNOUEpTT2JqZWN0KG5wT2JqZWN0KSkKKyAgICAgICAgICAgIHJl dHVybiBOUEpTT2JqZWN0Ojp0b05QSlNPYmplY3QobnBPYmplY3QpLT5qc09iamVjdCgpOworCisg ICAgICAgIEFTU0VSVChnbG9iYWxPYmplY3QpOworCisgICAgICAgIHJldHVybiBnZXRPckNyZWF0 ZUpTT2JqZWN0KGV4ZWMsIGdsb2JhbE9iamVjdCwgbnBPYmplY3QpOwogICAgIH0KLSAgICAKKyAg ICB9CisKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4ganNVbmRlZmluZWQo KTsKIH0KIApAQCAtMTczLDEzICsxODEsMjIgQEAgdm9pZCBOUFJ1bnRpbWVPYmplY3RNYXA6Omlu dmFsaWRhdGUoKQogICAgIEFTU0VSVChtX29iamVjdHMuaXNFbXB0eSgpKTsKIH0KIAotRXhlY1N0 YXRlKiBOUFJ1bnRpbWVPYmplY3RNYXA6Omdsb2JhbEV4ZWMoKSBjb25zdAorSlNHbG9iYWxPYmpl Y3QqIE5QUnVudGltZU9iamVjdE1hcDo6Z2xvYmFsT2JqZWN0KCkgY29uc3QKIHsKICAgICBGcmFt ZSogZnJhbWUgPSBtX3BsdWdpblZpZXctPmZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkKICAgICAg ICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gZnJhbWUtPnNjcmlwdCgpLT5nbG9iYWxPYmplY3Qo cGx1Z2luV29ybGQoKSk7Cit9CisKK0V4ZWNTdGF0ZSogTlBSdW50aW1lT2JqZWN0TWFwOjpnbG9i YWxFeGVjKCkgY29uc3QKK3sKKyAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0gdGhp cy0+Z2xvYmFsT2JqZWN0KCk7CisgICAgaWYgKCFnbG9iYWxPYmplY3QpCisgICAgICAgIHJldHVy biAwOwogICAgIAotICAgIHJldHVybiBmcmFtZS0+c2NyaXB0KCktPmdsb2JhbE9iamVjdChwbHVn aW5Xb3JsZCgpKS0+Z2xvYmFsRXhlYygpOworICAgIHJldHVybiBnbG9iYWxPYmplY3QtPmdsb2Jh bEV4ZWMoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9OUFJ1bnRpbWVPYmplY3RNYXAuaCBiL1dlYktpdDIvV2ViUHJv Y2Vzcy9QbHVnaW5zL05QUnVudGltZU9iamVjdE1hcC5oCmluZGV4IGM0ZTJhOWJmZTBhOTJlYTEy Nzg4MDczZmRmNTY5Y2YxM2I3MjFiMDUuLjZmMzI2M2M1YjQxZjY0NjQ1ZjU4MWFhNzAwYmEwYzQ3 ZDc5MTMzNzkgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGlt ZU9iamVjdE1hcC5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05QUnVudGltZU9i amVjdE1hcC5oCkBAIC02MSwxMSArNjEsMTIgQEAgcHVibGljOgogICAgIHZvaWQganNOUE9iamVj dERlc3Ryb3llZChKU05QT2JqZWN0Kik7CiAKICAgICB2b2lkIGNvbnZlcnRKU1ZhbHVlVG9OUFZh cmlhbnQoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTVmFsdWUsIE5QVmFyaWFudCYpOwotICAgIEpT Qzo6SlNWYWx1ZSBjb252ZXJ0TlBWYXJpYW50VG9KU1ZhbHVlKEpTQzo6RXhlY1N0YXRlKiwgY29u c3QgTlBWYXJpYW50Jik7CisgICAgSlNDOjpKU1ZhbHVlIGNvbnZlcnROUFZhcmlhbnRUb0pTVmFs dWUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTR2xvYmFsT2JqZWN0KiwgY29uc3QgTlBWYXJpYW50 Jik7CiAKICAgICAvLyBDYWxsZWQgd2hlbiB0aGUgcGx1Zy1pbiBpcyBkZXN0cm95ZWQuIFdpbGwg aW52YWxpZGF0ZSBhbGwgdGhlIE5QT2JqZWN0cy4KICAgICB2b2lkIGludmFsaWRhdGUoKTsKIAor ICAgIEpTQzo6SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCgpIGNvbnN0OwogICAgIEpTQzo6 RXhlY1N0YXRlKiBnbG9iYWxFeGVjKCkgY29uc3Q7CiAKIHByaXZhdGU6Cg==