93463 2012-08-08 04:50:01 -0700 [Qt] Port internal findMethodIndex method matcher to use JSC C API 2012-08-08 06:19:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60842 1 hausmann hausmann webkit.review.bot oldest_to_newest 690157 0 hausmann 2012-08-08 04:50:01 -0700 [Qt] Port internal findMethodIndex method matcher to use JSC C API 690162 1 157183 hausmann 2012-08-08 04:58:30 -0700 Created attachment 157183 Patch 690164 2 157183 kenneth 2012-08-08 05:02:23 -0700 Comment on attachment 157183 Patch rs=me 690252 3 157183 webkit.review.bot 2012-08-08 06:19:42 -0700 Comment on attachment 157183 Patch Clearing flags on attachment: 157183 Committed r125032: <http://trac.webkit.org/changeset/125032> 690253 4 webkit.review.bot 2012-08-08 06:19:45 -0700 All reviewed patches have been landed. Closing bug. 157183 2012-08-08 04:58:30 -0700 2012-08-08 06:19:42 -0700 Patch bug-93463-20120808135902.patch text/plain 14974 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzM3MTQ3YmZhZWE3OWI5 OTgzOTQzODZmN2I4MjNlM2IyYjQ2YmM5ZC4uMjhhOWY2NDFjYTFiY2MzNGZmNjY2MDkyY2FkYzgy MDM4NTg5N2Y1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA4LTA4ICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIFBv cnQgaW50ZXJuYWwgZmluZE1ldGhvZEluZGV4IG1ldGhvZCBtYXRjaGVyIHRvIHVzZSBKU0MgQyBB UEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzNDYz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQmFzZWQg b24gcGF0Y2ggYnkgTm8nYW0gUm9zZW50aGFsLgorCisgICAgICAgICogYnJpZGdlL3F0L3F0X3J1 bnRpbWUuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6c2V0RXhjZXB0aW9uKToKKyAgICAg ICAgKEJpbmRpbmdzKToKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6OmZpbmRNZXRob2RJbmRleCk6 IEZpeGVkIGFsc28gY29kaW5nIHN0eWxlIHdoaWxlIGF0IGl0LgorICAgICAgICAoSlNDOjpCaW5k aW5nczo6UXRSdW50aW1lTWV0YU1ldGhvZDo6Y2FsbCk6IFVzZSBuZXcgZmluZE1ldGhvZEluZGV4 LiBUaGUKKyAgICAgICAgY3JlYXRlZCBKU1ZhbHVlUmVmcyBzaG91bGQgbm90IG5lZWQgR0MgcHJv dGVjdGlvbiBiZWNhdXNlIHdlIG9ubHkgc3VwcG9ydAorICAgICAgICB1cCB0byAxMCBtZXRob2Qg YXJndW1lbnRzIGFuZCB0aHVzIHRoZXkgd2lsbCBsaXZlIG9uIHRoZSBzdGFjayBzdG9yYWdlCisg ICAgICAgIG9mIHRoZSB2ZWN0b3IuCisgICAgICAgICogYnJpZGdlL3F0L3F0X3J1bnRpbWUuaDoK KyAgICAgICAgKEJpbmRpbmdzKToKKwogMjAxMi0wOC0wOCAgS2VudGFybyBIYXJhICA8aGFyYWtl bkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgJ2NsYXNzIFdyYXBwZXJUeXBlSW5mbycgc2hvdWxk IGJlICdzdHJ1Y3QgV3JhcHBlclR5cGVJbmZvJwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9x dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCA1NDhhZjBkZWU1 OTUzMjdkYjY2ZmIzNDM1OWM4NWY3NjYxYmYwNjBlLi40ZGVlNzM4MzBkYjI4NjYwNjRjYWVmYjNj NGFmMGYzNmIwMjhlZGE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA4 LTA4ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNvbT4KKworICAgICAg ICBbUXRdIFBvcnQgaW50ZXJuYWwgZmluZE1ldGhvZEluZGV4IG1ldGhvZCBtYXRjaGVyIHRvIHVz ZSBKU0MgQyBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkzNDYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRqdXN0IHRoZSBleHBlY3RhdGlvbnMgb2YgdGhlIHVuaXQgdGVzdCBmb3Igc29tZSBvZiB0 aGUgZXhjZXB0aW9ucyB0aGUKKyAgICAgICAgbWV0aG9kIHRocm93cyB3aGVuIHNpZ25hbHMvc2xv dHMgY2Fubm90IGJlIGZvdW5kL21hdGNoZWQuIFRoZSBDIEFQSSBkb2Vzbid0IGFsbG93CisgICAg ICAgIHVzIHRvIGNyZWF0ZSBzeW50YXggKHR5cGUpIGVycm9ycywgb25seSBnZW5lcmljIGVycm9y IGV4Y2VwdGlvbnMuCisKKyAgICAgICAgKiB0ZXN0cy9xb2JqZWN0YnJpZGdlL3RzdF9xb2JqZWN0 YnJpZGdlLmNwcDoKKyAgICAgICAgKHRzdF9RT2JqZWN0QnJpZGdlOjpjYWxsUXRJbnZva2FibGUp OgorCiAyMDEyLTA4LTA3ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkIHRyaXZpYWwgZml4OiBNaXNzZWQgSEFWRV9RVDUgcmVt b3ZhbCBhcyBwYXJ0IG9mIHIxMjQ4NzkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JyaWRn ZS9xdC9xdF9ydW50aW1lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1l LmNwcAppbmRleCBjZWJlNTEyNjMyYmQ1MGQ3NWQ2MTMyZGM0YTdmN2Y5MWIxM2ZiZmNhLi44Y2Zl MzBiOTdhOGMzZmFkZmY3ZGM2NDVlOWY2NTExNmFlMjk3MDhiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYnJp ZGdlL3F0L3F0X3J1bnRpbWUuY3BwCkBAIC0xMjIsNiArMTIyLDE3IEBAIFFEZWJ1ZyBvcGVyYXRv cjw8KFFEZWJ1ZyBkYmcsIGNvbnN0IEpTUmVhbFR5cGUgJmMpCiB9CiAjZW5kaWYKIAordm9pZCBz ZXRFeGNlcHRpb24oSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbiwg Y29uc3QgUVN0cmluZyYgdGV4dCkKK3sKKyAgICBpZiAoIWV4Y2VwdGlvbikKKyAgICAgICAgcmV0 dXJuOworCisgICAgSlNTdHJpbmdSZWYgZXJyb3JTdHIgPSBKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4 Q1N0cmluZyh0ZXh0LnRvVXRmOCgpKTsKKyAgICBKU1ZhbHVlUmVmIGVycm9yVmFsW10gPSB7IEpT VmFsdWVNYWtlU3RyaW5nKGNvbnRleHQsIGVycm9yU3RyKSB9OworICAgICpleGNlcHRpb24gPSBK U09iamVjdE1ha2VFcnJvcihjb250ZXh0LCAxLCBlcnJvclZhbCwgMCk7CisgICAgSlNTdHJpbmdS ZWxlYXNlKGVycm9yU3RyKTsKK30KKwogc3RydWN0IFJ1bnRpbWVDb252ZXJzaW9uIHsKICAgICBD b252ZXJ0VG9KU1ZhbHVlRnVuY3Rpb24gdG9KU1ZhbHVlRnVuYzsKICAgICBDb252ZXJ0VG9WYXJp YW50RnVuY3Rpb24gdG9WYXJpYW50RnVuYzsKQEAgLTExNDEsMTMgKzExNTIsMTUgQEAgc3RhdGlj IGludCBpbmRleE9mTWV0YUVudW0oY29uc3QgUU1ldGFPYmplY3QgKm1ldGEsIGNvbnN0IFFCeXRl QXJyYXkgJnN0cikKIAogLy8gSGVscGVyIGZ1bmN0aW9uIGZvciByZXNvbHZpbmcgbWV0aG9kcwog Ly8gTGFyZ2VseSBiYXNlZCBvbiBjb2RlIGluIFF0U2NyaXB0IGZvciBjb21wYXRpYmlsaXR5IHJl YXNvbnMKLXN0YXRpYyBpbnQgZmluZE1ldGhvZEluZGV4KEV4ZWNTdGF0ZSogZXhlYywKK3N0YXRp YyBpbnQgZmluZE1ldGhvZEluZGV4KEpTQ29udGV4dFJlZiBjb250ZXh0LAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgUU1ldGFPYmplY3QqIG1ldGEsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBRQnl0ZUFycmF5JiBzaWduYXR1cmUsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICBpbnQgYXJndW1lbnRDb3VudCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IEpTVmFsdWVSZWYgYXJndW1lbnRzW10sCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICBib29sIGFsbG93UHJpdmF0ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIFFWYXJMZW5n dGhBcnJheTxRVmFyaWFudCwgMTA+ICZ2YXJzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg dm9pZCoqIHZ2YXJzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgSlNPYmplY3QgKipwRXJy b3IpCisgICAgICAgICAgICAgICAgICAgICAgICAgICBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCiB7 CiAgICAgUUxpc3Q8aW50PiBtYXRjaGluZ0luZGljZXM7CiAKQEAgLTExNjksNyArMTE4Miw2IEBA IHN0YXRpYyBpbnQgZmluZE1ldGhvZEluZGV4KEV4ZWNTdGF0ZSogZXhlYywKICAgICB9CiAKICAg ICBpbnQgY2hvc2VuSW5kZXggPSAtMTsKLSAgICAqcEVycm9yID0gMDsKICAgICBRVmVjdG9yPFF0 TWV0aG9kTWF0Y2hUeXBlPiBjaG9zZW5UeXBlczsKIAogICAgIFFWYXJMZW5ndGhBcnJheTxRVmFy aWFudCwgMTA+IGFyZ3M7CkBAIC0xMjI4LDcgKzEyNDAsNyBAQCBzdGF0aWMgaW50IGZpbmRNZXRo b2RJbmRleChFeGVjU3RhdGUqIGV4ZWMsCiAgICAgICAgIH0KIAogICAgICAgICAvLyBJZiB0aGUg bmF0aXZlIG1ldGhvZCByZXF1aXJlcyBtb3JlIGFyZ3VtZW50cyB0aGFuIHdoYXQgd2FzIHBhc3Nl ZCBmcm9tIEphdmFTY3JpcHQKLSAgICAgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSArIDEg PCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4odHlwZXMuY291bnQoKSkpIHsKKyAgICAgICAgaWYgKGFy Z3VtZW50Q291bnQgKyAxIDwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHR5cGVzLmNvdW50KCkpKSB7 CiAgICAgICAgICAgICBxTWF0Y2hEZWJ1ZygpIDw8ICJNYXRjaDp0b28gZmV3IGFyZ3MgZm9yIiA8 PCBtZXRob2QubWV0aG9kU2lnbmF0dXJlKCk7CiAgICAgICAgICAgICB0b29GZXdBcmdzLmFwcGVu ZChpbmRleCk7CiAgICAgICAgICAgICBjb250aW51ZTsKQEAgLTEyNTMsMTAgKzEyNjUsMTAgQEAg c3RhdGljIGludCBmaW5kTWV0aG9kSW5kZXgoRXhlY1N0YXRlKiBleGVjLAogICAgICAgICBib29s IGNvbnZlcnRlZCA9IHRydWU7CiAgICAgICAgIGludCBtYXRjaERpc3RhbmNlID0gMDsKICAgICAg ICAgZm9yICh1bnNpZ25lZCBpID0gMDsgY29udmVydGVkICYmIGkgKyAxIDwgc3RhdGljX2Nhc3Q8 dW5zaWduZWQ+KHR5cGVzLmNvdW50KCkpOyArK2kpIHsKLSAgICAgICAgICAgIEpTVmFsdWUgYXJn ID0gaSA8IGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA/IGV4ZWMtPmFyZ3VtZW50KGkpIDoganNVbmRl ZmluZWQoKTsKKyAgICAgICAgICAgIEpTVmFsdWVSZWYgYXJnID0gaSA8IGFyZ3VtZW50Q291bnQg PyBhcmd1bWVudHNbaV0gOiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsKIAogICAgICAg ICAgICAgaW50IGFyZ2Rpc3RhbmNlID0gLTE7Ci0gICAgICAgICAgICBRVmFyaWFudCB2ID0gY29u dmVydFZhbHVlVG9RVmFyaWFudChleGVjLCBhcmcsIHR5cGVzLmF0KGkrMSkudHlwZUlkKCksICZh cmdkaXN0YW5jZSk7CisgICAgICAgICAgICBRVmFyaWFudCB2ID0gY29udmVydFZhbHVlVG9RVmFy aWFudCh0b0pTKGNvbnRleHQpLCB0b0pTKHRvSlMoY29udGV4dCksIGFyZyksIHR5cGVzLmF0KGkr MSkudHlwZUlkKCksICZhcmdkaXN0YW5jZSk7CiAgICAgICAgICAgICBpZiAoYXJnZGlzdGFuY2Ug Pj0gMCkgewogICAgICAgICAgICAgICAgIG1hdGNoRGlzdGFuY2UgKz0gYXJnZGlzdGFuY2U7CiAg ICAgICAgICAgICAgICAgYXJnc1tpKzFdID0gdjsKQEAgLTEyNjksMjUgKzEyODEsMjMgQEAgc3Rh dGljIGludCBmaW5kTWV0aG9kSW5kZXgoRXhlY1N0YXRlKiBleGVjLAogICAgICAgICBxTWF0Y2hE ZWJ1ZygpIDw8ICJNYXRjaDogIiA8PCBtZXRob2QubWV0aG9kU2lnbmF0dXJlKCkgPDwgKGNvbnZl cnRlZCA/ICJjb252ZXJ0ZWQiOiJmYWlsZWQgdG8gY29udmVydCIpIDw8ICJkaXN0YW5jZSAiIDw8 IG1hdGNoRGlzdGFuY2U7CiAKICAgICAgICAgaWYgKGNvbnZlcnRlZCkgewotICAgICAgICAgICAg aWYgKChleGVjLT5hcmd1bWVudENvdW50KCkgKyAxID09IHN0YXRpY19jYXN0PHVuc2lnbmVkPih0 eXBlcy5jb3VudCgpKSkKKyAgICAgICAgICAgIGlmICgoYXJndW1lbnRDb3VudCArIDEgPT0gc3Rh dGljX2Nhc3Q8dW5zaWduZWQ+KHR5cGVzLmNvdW50KCkpKQogICAgICAgICAgICAgICAgICYmICht YXRjaERpc3RhbmNlID09IDApKSB7CiAgICAgICAgICAgICAgICAgLy8gcGVyZmVjdCBtYXRjaCwg dXNlIHRoaXMgb25lCiAgICAgICAgICAgICAgICAgY2hvc2VuSW5kZXggPSBpbmRleDsKICAgICAg ICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAg UXRNZXRob2RNYXRjaERhdGEgY3VycmVudE1hdGNoKG1hdGNoRGlzdGFuY2UsIGluZGV4LCB0eXBl cywgYXJncyk7Ci0gICAgICAgICAgICAgICAgaWYgKGNhbmRpZGF0ZXMuaXNFbXB0eSgpKSB7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICBRdE1ldGhvZE1hdGNoRGF0YSBjdXJyZW50TWF0Y2go bWF0Y2hEaXN0YW5jZSwgaW5kZXgsIHR5cGVzLCBhcmdzKTsKKyAgICAgICAgICAgIGlmIChjYW5k aWRhdGVzLmlzRW1wdHkoKSkKKyAgICAgICAgICAgICAgICBjYW5kaWRhdGVzLmFwcGVuZChjdXJy ZW50TWF0Y2gpOworICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgUXRNZXRob2RN YXRjaERhdGEgYmVzdE1hdGNoU29GYXIgPSBjYW5kaWRhdGVzLmF0KDApOworICAgICAgICAgICAg ICAgIGlmICgoYXJncy5jb3VudCgpID4gYmVzdE1hdGNoU29GYXIuYXJncy5jb3VudCgpKQorICAg ICAgICAgICAgICAgICAgICB8fCAoKGFyZ3MuY291bnQoKSA9PSBiZXN0TWF0Y2hTb0Zhci5hcmdz LmNvdW50KCkpCisgICAgICAgICAgICAgICAgICAgICYmIChtYXRjaERpc3RhbmNlIDw9IGJlc3RN YXRjaFNvRmFyLm1hdGNoRGlzdGFuY2UpKSkKKyAgICAgICAgICAgICAgICAgICAgY2FuZGlkYXRl cy5wcmVwZW5kKGN1cnJlbnRNYXRjaCk7CisgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAg ICAgICAgICAgICBjYW5kaWRhdGVzLmFwcGVuZChjdXJyZW50TWF0Y2gpOwotICAgICAgICAgICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgIFF0TWV0aG9kTWF0Y2hEYXRhIGJlc3RN YXRjaFNvRmFyID0gY2FuZGlkYXRlcy5hdCgwKTsKLSAgICAgICAgICAgICAgICAgICAgaWYgKChh cmdzLmNvdW50KCkgPiBiZXN0TWF0Y2hTb0Zhci5hcmdzLmNvdW50KCkpCi0gICAgICAgICAgICAg ICAgICAgICAgICB8fCAoKGFyZ3MuY291bnQoKSA9PSBiZXN0TWF0Y2hTb0Zhci5hcmdzLmNvdW50 KCkpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgJiYgKG1hdGNoRGlzdGFuY2UgPD0gYmVz dE1hdGNoU29GYXIubWF0Y2hEaXN0YW5jZSkpKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBj YW5kaWRhdGVzLnByZXBlbmQoY3VycmVudE1hdGNoKTsKLSAgICAgICAgICAgICAgICAgICAgfSBl bHNlIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGNhbmRpZGF0ZXMuYXBwZW5kKGN1cnJlbnRN YXRjaCk7Ci0gICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICB9CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBjb252ZXJzaW9uRmFpbGVkLmFw cGVuZChpbmRleCk7CkBAIC0xMzA4LDcgKzEzMTgsNyBAQCBzdGF0aWMgaW50IGZpbmRNZXRob2RJ bmRleChFeGVjU3RhdGUqIGV4ZWMsCiAgICAgICAgICAgICAgICAgUU1ldGFNZXRob2QgbXRkID0g bWV0YS0+bWV0aG9kKGNvbnZlcnNpb25GYWlsZWQuYXQoaSkpOwogICAgICAgICAgICAgICAgIG1l c3NhZ2UgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiICAgICUwIikuYXJnKFFTdHJpbmc6OmZyb21M YXRpbjEobXRkLm1ldGhvZFNpZ25hdHVyZSgpKSk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAqcEVycm9yID0gdGhyb3dFcnJvcihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhlYywgbWVzc2Fn ZS50b0xhdGluMSgpLmNvbnN0RGF0YSgpKSk7CisgICAgICAgICAgICBzZXRFeGNlcHRpb24oY29u dGV4dCwgZXhjZXB0aW9uLCBtZXNzYWdlKTsKICAgICAgICAgfSBlbHNlIGlmICghdW5yZXNvbHZl ZC5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIFF0TWV0aG9kTWF0Y2hEYXRhIGFyZ3NJbnN0YW5j ZSA9IHVucmVzb2x2ZWQuZmlyc3QoKTsKICAgICAgICAgICAgIGludCB1bnJlc29sdmVkSW5kZXgg PSBhcmdzSW5zdGFuY2UuZmlyc3RVbnJlc29sdmVkSW5kZXgoKTsKQEAgLTEzMTcsNyArMTMyNyw3 IEBAIHN0YXRpYyBpbnQgZmluZE1ldGhvZEluZGV4KEV4ZWNTdGF0ZSogZXhlYywKICAgICAgICAg ICAgIFFTdHJpbmcgbWVzc2FnZSA9IFFTdHJpbmc6OmZyb21MYXRpbjEoImNhbm5vdCBjYWxsICUw KCk6IHVua25vd24gdHlwZSBgJTEnIikKICAgICAgICAgICAgICAgICAuYXJnKFFTdHJpbmc6OmZy b21MYXRpbjEoc2lnbmF0dXJlKSkKICAgICAgICAgICAgICAgICAuYXJnKFFMYXRpbjFTdHJpbmco dW5yZXNvbHZlZFR5cGUubmFtZSgpKSk7Ci0gICAgICAgICAgICAqcEVycm9yID0gdGhyb3dFcnJv cihleGVjLCBjcmVhdGVUeXBlRXJyb3IoZXhlYywgbWVzc2FnZS50b0xhdGluMSgpLmNvbnN0RGF0 YSgpKSk7CisgICAgICAgICAgICBzZXRFeGNlcHRpb24oY29udGV4dCwgZXhjZXB0aW9uLCBtZXNz YWdlKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIFFTdHJpbmcgbWVzc2FnZSA9IFFT dHJpbmc6OmZyb21MYXRpbjEoInRvbyBmZXcgYXJndW1lbnRzIGluIGNhbGwgdG8gJTAoKTsgY2Fu ZGlkYXRlcyBhcmVcbiIpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuYXJnKFFTdHJp bmc6OmZyb21MYXRpbjEoc2lnbmF0dXJlKSk7CkBAIC0xMzI3LDcgKzEzMzcsNyBAQCBzdGF0aWMg aW50IGZpbmRNZXRob2RJbmRleChFeGVjU3RhdGUqIGV4ZWMsCiAgICAgICAgICAgICAgICAgUU1l dGFNZXRob2QgbXRkID0gbWV0YS0+bWV0aG9kKHRvb0Zld0FyZ3MuYXQoaSkpOwogICAgICAgICAg ICAgICAgIG1lc3NhZ2UgKz0gUVN0cmluZzo6ZnJvbUxhdGluMSgiICAgICUwIikuYXJnKFFTdHJp bmc6OmZyb21MYXRpbjEobXRkLm1ldGhvZFNpZ25hdHVyZSgpKSk7CiAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICAqcEVycm9yID0gdGhyb3dFcnJvcihleGVjLCBjcmVhdGVTeW50YXhFcnJvcihl eGVjLCBtZXNzYWdlLnRvTGF0aW4xKCkuY29uc3REYXRhKCkpKTsKKyAgICAgICAgICAgIHNldEV4 Y2VwdGlvbihjb250ZXh0LCBleGNlcHRpb24sIG1lc3NhZ2UpOwogICAgICAgICB9CiAgICAgfQog CkBAIC0xMzQ5LDcgKzEzNTksNyBAQCBzdGF0aWMgaW50IGZpbmRNZXRob2RJbmRleChFeGVjU3Rh dGUqIGV4ZWMsCiAgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2UgKz0gUVN0cmluZzo6ZnJvbUxh dGluMSgiICAgICUwIikuYXJnKFFTdHJpbmc6OmZyb21MYXRpbjEobXRkLm1ldGhvZFNpZ25hdHVy ZSgpKSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQotICAgICAgICAgICAgKnBF cnJvciA9IHRocm93RXJyb3IoZXhlYywgY3JlYXRlVHlwZUVycm9yKGV4ZWMsIG1lc3NhZ2UudG9M YXRpbjEoKS5jb25zdERhdGEoKSkpOworICAgICAgICAgICAgc2V0RXhjZXB0aW9uKGNvbnRleHQs IGV4Y2VwdGlvbiwgbWVzc2FnZSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBjaG9z ZW5JbmRleCA9IGJlc3RNYXRjaC5pbmRleDsKICAgICAgICAgICAgIGFyZ3MgPSBiZXN0TWF0Y2gu YXJnczsKQEAgLTE0MjQsMTIgKzE0MzQsMTcgQEAgRW5jb2RlZEpTVmFsdWUgUXRSdW50aW1lTWV0 YU1ldGhvZDo6Y2FsbChFeGVjU3RhdGUqIGV4ZWMpCiAKICAgICBRT2JqZWN0ICpvYmogPSBkLT5t X2luc3RhbmNlLT5nZXRPYmplY3QoKTsKICAgICBpZiAob2JqKSB7CisgICAgICAgIGNvbnN0IGlu dCBhcmd1bWVudENvdW50ID0gc3RhdGljX2Nhc3Q8aW50PihleGVjLT5hcmd1bWVudENvdW50KCkp OworICAgICAgICBWZWN0b3I8SlNWYWx1ZVJlZiwgMTA+IGFyZ3MoYXJndW1lbnRDb3VudCk7Cisg ICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgYXJndW1lbnRDb3VudDsgKytpKQorICAgICAgICAg ICAgYXJnc1tpXSA9IHRvUmVmKGV4ZWMsIGV4ZWMtPmFyZ3VtZW50KGkpKTsKKwogICAgICAgICBR VmFyTGVuZ3RoQXJyYXk8UVZhcmlhbnQsIDEwPiB2YXJnczsKICAgICAgICAgdm9pZCAqcWFyZ3Nb MTFdOwogCiAgICAgICAgIGludCBtZXRob2RJbmRleDsKLSAgICAgICAgSlNPYmplY3QqIGVycm9y T2JqID0gMDsKLSAgICAgICAgaWYgKChtZXRob2RJbmRleCA9IGZpbmRNZXRob2RJbmRleChleGVj LCBvYmotPm1ldGFPYmplY3QoKSwgZC0+bV9zaWduYXR1cmUsIGQtPm1fYWxsb3dQcml2YXRlLCB2 YXJncywgKHZvaWQgKiopcWFyZ3MsICZlcnJvck9iaikpICE9IC0xKSB7CisgICAgICAgIEpTVmFs dWVSZWYgZXhjZXB0aW9uID0gMDsKKyAgICAgICAgaWYgKChtZXRob2RJbmRleCA9IGZpbmRNZXRo b2RJbmRleCh0b1JlZihleGVjKSwgb2JqLT5tZXRhT2JqZWN0KCksIGQtPm1fc2lnbmF0dXJlLCBh cmd1bWVudENvdW50LCBhcmdzLmRhdGEoKSwgZC0+bV9hbGxvd1ByaXZhdGUsIHZhcmdzLCAodm9p ZCAqKilxYXJncywgJmV4Y2VwdGlvbikpICE9IC0xKSB7CiAgICAgICAgICAgICBpZiAoUU1ldGFP YmplY3Q6Om1ldGFjYWxsKG9iaiwgUU1ldGFPYmplY3Q6Okludm9rZU1ldGFNZXRob2QsIG1ldGhv ZEluZGV4LCBxYXJncykgPj0gMCkKICAgICAgICAgICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5j b2RlKGpzVW5kZWZpbmVkKCkpOwogCkBAIC0xNDM3LDggKzE0NTIsOCBAQCBFbmNvZGVkSlNWYWx1 ZSBRdFJ1bnRpbWVNZXRhTWV0aG9kOjpjYWxsKEV4ZWNTdGF0ZSogZXhlYykKICAgICAgICAgICAg ICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGNvbnZlcnRRVmFyaWFudFRvVmFsdWUoZXhlYywg ZC0+bV9pbnN0YW5jZS0+cm9vdE9iamVjdCgpLCB2YXJnc1swXSkpOwogICAgICAgICB9CiAKLSAg ICAgICAgaWYgKGVycm9yT2JqKQotICAgICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShl cnJvck9iaik7CisgICAgICAgIGlmIChleGNlcHRpb24pCisgICAgICAgICAgICByZXR1cm4gdGhy b3dWTUVycm9yKGV4ZWMsIHRvSlMoZXhlYywgZXhjZXB0aW9uKSk7CiAgICAgfSBlbHNlIHsKICAg ICAgICAgcmV0dXJuIHRocm93Vk1FcnJvcihleGVjLCBjcmVhdGVFcnJvcihleGVjLCAiY2Fubm90 IGNhbGwgZnVuY3Rpb24gb2YgZGVsZXRlZCBRT2JqZWN0IikpOwogICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmggYi9Tb3VyY2UvV2ViQ29yZS9i cmlkZ2UvcXQvcXRfcnVudGltZS5oCmluZGV4IDNjNjk0ZGU4MmNlMDY0ODdlOTU2YThjNWE2ZDg5 YmFmNmQyNDU4ZTQuLmIyZmQ2NmQ0MzY1M2FiNTZkMjY5NzI5NmI2MTA5ODQzN2QwMzA4N2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuaApAQCAtMjcxLDYgKzI3MSw4IEBAIHZv aWQgcmVnaXN0ZXJDdXN0b21UeXBlKGludCBxdE1ldGFUeXBlSWQsIENvbnZlcnRUb1ZhcmlhbnRG dW5jdGlvbiwgQ29udmVydFRvSlNWCiBRVmFyaWFudCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KEV4 ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBlIGhpbnQsIGludCAq ZGlzdGFuY2UpOwogSlNWYWx1ZSBjb252ZXJ0UVZhcmlhbnRUb1ZhbHVlKEV4ZWNTdGF0ZSogZXhl YywgUGFzc1JlZlB0cjxSb290T2JqZWN0PiByb290LCBjb25zdCBRVmFyaWFudCYgdmFyaWFudCk7 CiAKK3ZvaWQgc2V0RXhjZXB0aW9uKEpTQ29udGV4dFJlZiwgSlNWYWx1ZVJlZiogZXhjZXB0aW9u LCBjb25zdCBRU3RyaW5nJiB0ZXh0KTsKKwogfSAvLyBuYW1lc3BhY2UgQmluZGluZ3MKIH0gLy8g bmFtZXNwYWNlIEpTQwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FvYmpl Y3RicmlkZ2UvdHN0X3FvYmplY3RicmlkZ2UuY3BwIGIvU291cmNlL1dlYktpdC9xdC90ZXN0cy9x b2JqZWN0YnJpZGdlL3RzdF9xb2JqZWN0YnJpZGdlLmNwcAppbmRleCBiYTVlMjZjNGY0ODM5ZmE4 MzJjODhmNzc4OGZlYTczNmUwYjA1YmE4Li45ZDA1ZmFhYThlZjk1MDUzY2RkZjQyMjAxZWU5ZTBj ZDZlMzhiN2Y3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L3Rlc3RzL3FvYmplY3Ricmlk Z2UvdHN0X3FvYmplY3RicmlkZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvcXQvdGVzdHMvcW9i amVjdGJyaWRnZS90c3RfcW9iamVjdGJyaWRnZS5jcHAKQEAgLTExNDEsNyArMTE0MSw3IEBAIHZv aWQgdHN0X1FPYmplY3RCcmlkZ2U6OmNhbGxRdEludm9rYWJsZSgpCiAgICAgICAgIFFTdHJpbmcg dHlwZTsKICAgICAgICAgUVN0cmluZyByZXQgPSBldmFsSlMoIm15T2JqZWN0Lm15SW52b2thYmxl V2l0aFZvaWRTdGFyQXJnKDEyMykiLCB0eXBlKTsKICAgICAgICAgUUNPTVBBUkUodHlwZSwgc0Vy cm9yKTsKLSAgICAgICAgUUNPTVBBUkUocmV0LCBRTGF0aW4xU3RyaW5nKCJUeXBlRXJyb3I6IGlu Y29tcGF0aWJsZSB0eXBlIG9mIGFyZ3VtZW50KHMpIGluIGNhbGwgdG8gbXlJbnZva2FibGVXaXRo Vm9pZFN0YXJBcmcoKTsgY2FuZGlkYXRlcyB3ZXJlXG4gICAgbXlJbnZva2FibGVXaXRoVm9pZFN0 YXJBcmcodm9pZCopIikpOworICAgICAgICBRQ09NUEFSRShyZXQsIFFMYXRpbjFTdHJpbmcoIkVy cm9yOiBpbmNvbXBhdGlibGUgdHlwZSBvZiBhcmd1bWVudChzKSBpbiBjYWxsIHRvIG15SW52b2th YmxlV2l0aFZvaWRTdGFyQXJnKCk7IGNhbmRpZGF0ZXMgd2VyZVxuICAgIG15SW52b2thYmxlV2l0 aFZvaWRTdGFyQXJnKHZvaWQqKSIpKTsKICAgICAgICAgUUNPTVBBUkUobV9teU9iamVjdC0+cXRG dW5jdGlvbkludm9rZWQoKSwgLTEpOwogICAgIH0KIApAQCAtMTE1MCw3ICsxMTUwLDcgQEAgdm9p ZCB0c3RfUU9iamVjdEJyaWRnZTo6Y2FsbFF0SW52b2thYmxlKCkKICAgICAgICAgUVN0cmluZyB0 eXBlOwogICAgICAgICBRU3RyaW5nIHJldCA9IGV2YWxKUygibXlPYmplY3QubXlJbnZva2FibGVX aXRoQW1iaWd1b3VzQXJnKDEyMykiLCB0eXBlKTsKICAgICAgICAgUUNPTVBBUkUodHlwZSwgc0Vy cm9yKTsKLSAgICAgICAgUUNPTVBBUkUocmV0LCBRTGF0aW4xU3RyaW5nKCJUeXBlRXJyb3I6IGFt YmlndW91cyBjYWxsIG9mIG92ZXJsb2FkZWQgZnVuY3Rpb24gbXlJbnZva2FibGVXaXRoQW1iaWd1 b3VzQXJnKCk7IGNhbmRpZGF0ZXMgd2VyZVxuICAgIG15SW52b2thYmxlV2l0aEFtYmlndW91c0Fy ZyhpbnQpXG4gICAgbXlJbnZva2FibGVXaXRoQW1iaWd1b3VzQXJnKHVpbnQpIikpOworICAgICAg ICBRQ09NUEFSRShyZXQsIFFMYXRpbjFTdHJpbmcoIkVycm9yOiBhbWJpZ3VvdXMgY2FsbCBvZiBv dmVybG9hZGVkIGZ1bmN0aW9uIG15SW52b2thYmxlV2l0aEFtYmlndW91c0FyZygpOyBjYW5kaWRh dGVzIHdlcmVcbiAgICBteUludm9rYWJsZVdpdGhBbWJpZ3VvdXNBcmcoaW50KVxuICAgIG15SW52 b2thYmxlV2l0aEFtYmlndW91c0FyZyh1aW50KSIpKTsKICAgICB9CiAKICAgICBtX215T2JqZWN0 LT5yZXNldFF0RnVuY3Rpb25JbnZva2VkKCk7CkBAIC0xMzc5LDcgKzEzNzksNyBAQCB2b2lkIHRz dF9RT2JqZWN0QnJpZGdlOjpjYWxsUXRJbnZva2FibGUoKQogICAgICAgICBRU3RyaW5nIHR5cGU7 CiAgICAgICAgIFFTdHJpbmcgcmV0ID0gZXZhbEpTKCJteU9iamVjdC5teUludm9rYWJsZVdpdGhJ bnRBcmcoKSIsIHR5cGUpOwogICAgICAgICBRQ09NUEFSRSh0eXBlLCBzRXJyb3IpOwotICAgICAg ICBRQ09NUEFSRShyZXQsIFFMYXRpbjFTdHJpbmcoIlN5bnRheEVycm9yOiB0b28gZmV3IGFyZ3Vt ZW50cyBpbiBjYWxsIHRvIG15SW52b2thYmxlV2l0aEludEFyZygpOyBjYW5kaWRhdGVzIGFyZVxu ICAgIG15SW52b2thYmxlV2l0aEludEFyZyhpbnQsaW50KVxuICAgIG15SW52b2thYmxlV2l0aElu dEFyZyhpbnQpIikpOworICAgICAgICBRQ09NUEFSRShyZXQsIFFMYXRpbjFTdHJpbmcoIkVycm9y OiB0b28gZmV3IGFyZ3VtZW50cyBpbiBjYWxsIHRvIG15SW52b2thYmxlV2l0aEludEFyZygpOyBj YW5kaWRhdGVzIGFyZVxuICAgIG15SW52b2thYmxlV2l0aEludEFyZyhpbnQsaW50KVxuICAgIG15 SW52b2thYmxlV2l0aEludEFyZyhpbnQpIikpOwogICAgIH0KIAogICAgIC8vIGNhbGwgZnVuY3Rp b24gd2hlcmUgbm90IGFsbCB0eXBlcyBoYXZlIGJlZW4gcmVnaXN0ZXJlZApAQCAtMTM4OCw3ICsx Mzg4LDcgQEAgdm9pZCB0c3RfUU9iamVjdEJyaWRnZTo6Y2FsbFF0SW52b2thYmxlKCkKICAgICAg ICAgUVN0cmluZyB0eXBlOwogICAgICAgICBRU3RyaW5nIHJldCA9IGV2YWxKUygibXlPYmplY3Qu bXlJbnZva2FibGVXaXRoQnJ1c2hTdHlsZUFyZygwKSIsIHR5cGUpOwogICAgICAgICBRQ09NUEFS RSh0eXBlLCBzRXJyb3IpOwotICAgICAgICBRQ09NUEFSRShyZXQsIFFMYXRpbjFTdHJpbmcoIlR5 cGVFcnJvcjogY2Fubm90IGNhbGwgbXlJbnZva2FibGVXaXRoQnJ1c2hTdHlsZUFyZygpOiB1bmtu b3duIHR5cGUgYFF0OjpCcnVzaFN0eWxlJyIpKTsKKyAgICAgICAgUUNPTVBBUkUocmV0LCBRTGF0 aW4xU3RyaW5nKCJFcnJvcjogY2Fubm90IGNhbGwgbXlJbnZva2FibGVXaXRoQnJ1c2hTdHlsZUFy ZygpOiB1bmtub3duIHR5cGUgYFF0OjpCcnVzaFN0eWxlJyIpKTsKICAgICAgICAgUUNPTVBBUkUo bV9teU9iamVjdC0+cXRGdW5jdGlvbkludm9rZWQoKSwgLTEpOwogICAgIH0KIApAQCAtMTM5OCw3 ICsxMzk4LDcgQEAgdm9pZCB0c3RfUU9iamVjdEJyaWRnZTo6Y2FsbFF0SW52b2thYmxlKCkKICAg ICAgICAgUVN0cmluZyB0eXBlOwogICAgICAgICBRU3RyaW5nIHJldCA9IGV2YWxKUygibXlPYmpl Y3QubXlJbnZva2FibGVXaXRoUUJydXNoQXJnKG51bGwpIiwgdHlwZSk7CiAgICAgICAgIFFDT01Q QVJFKHR5cGUsIHNFcnJvcik7Ci0gICAgICAgIFFDT01QQVJFKHJldCwgUUxhdGluMVN0cmluZygi VHlwZUVycm9yOiBpbmNvbXBhdGlibGUgdHlwZSBvZiBhcmd1bWVudChzKSBpbiBjYWxsIHRvIG15 SW52b2thYmxlV2l0aFFCcnVzaEFyZygpOyBjYW5kaWRhdGVzIHdlcmVcbiAgICBteUludm9rYWJs ZVdpdGhRQnJ1c2hBcmcoUUJydXNoKSIpKTsKKyAgICAgICAgUUNPTVBBUkUocmV0LCBRTGF0aW4x U3RyaW5nKCJFcnJvcjogaW5jb21wYXRpYmxlIHR5cGUgb2YgYXJndW1lbnQocykgaW4gY2FsbCB0 byBteUludm9rYWJsZVdpdGhRQnJ1c2hBcmcoKTsgY2FuZGlkYXRlcyB3ZXJlXG4gICAgbXlJbnZv a2FibGVXaXRoUUJydXNoQXJnKFFCcnVzaCkiKSk7CiAgICAgICAgIFFDT01QQVJFKG1fbXlPYmpl Y3QtPnF0RnVuY3Rpb25JbnZva2VkKCksIC0xKTsKICAgICB9CiB9Cg==