125613 2013-12-11 19:00:55 -0800 jsCStack: Rename returnFromJavaScript to handleUncaughtException 2013-12-12 11:18:50 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam fpizlo ggaren mhahnenberg msaboff oliver oldest_to_newest 959017 0 mark.lam 2013-12-11 19:00:55 -0800 "returnFromJavaScript" should actually be renamed to "handleUncaughtException" because that is what it actually does. 959019 1 219030 mark.lam 2013-12-11 19:07:57 -0800 Created attachment 219030 the patch. 959021 2 219031 mark.lam 2013-12-11 19:13:54 -0800 Created attachment 219031 patch 2: missed LowLevelInterpreter32_64.asm 959256 3 mark.lam 2013-12-12 11:18:50 -0800 Thanks for the review. Landed in r160497 on the jsCStack branch: <http://trac.webkit.org/r160497>. 219030 2013-12-11 19:07:57 -0800 2013-12-11 19:13:54 -0800 the patch. bug-125613.patch text/plain 7630 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYwNDczKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDEzLTEyLTExICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgcmV0dXJuRnJvbUphdmFTY3JpcHQgdG8gaGFuZGxlVW5jYXVnaHRFeGNlcHRpb24uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU2MTMuCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbyBkaWQg YSBmZXcgbWlub3IgZml4ZXMgdG8gZ2V0IHRoZSBDIExvb3AgTExJTlQgb2ZmbGluZSBhc20gc3Rh Z2UKKyAgICAgICAgdG8gYnVpbGQgcHJvcGVybHksIGFuZCBhbHNvIHNvbWUgdHJpdmlhbCBjaGFu Z2VzIHRvIG1pbmltaXplIHRoZQorICAgICAgICBjb21waWxlIGVycm9ycyBmb3IgTG93TGV2ZWxJ bnRlcnByZXRlci5jcHAuIEl0IGRvZXNuJ3QgYnVpbGQgY29tcGxldGVseQorICAgICAgICBhbmQg cnVuIHlldCBzaW5jZSB3ZSdsbCBuZWVkIHRvIHVwZGF0ZSBpdCBmb3IgQ1N0YWNrIGNoYW5nZXMg dGhhdCBoYXZlCisgICAgICAgIG5vdCBiZWVuIGltcGxlbWVudGVkIGZvciB0aGUgQyBMb29wIExM SU5UIHlldC4KKworICAgICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVyLmNwcDoKKyAgICAg ICAgKEpTQzo6dW53aW5kQ2FsbEZyYW1lKToKKyAgICAgICAgKiBqaXQvSklURXhjZXB0aW9ucy5j cHA6CisgICAgICAgIChKU0M6OmdlbmVyaWNVbndpbmQpOgorICAgICAgICAqIGppdC9KSVRTdHVi cy5oOgorICAgICAgICAqIGppdC9KSVRTdHVic01TVkM2NC5hc206CisgICAgICAgICogaml0L0pJ VFN0dWJzWDg2Lmg6CisgICAgICAgICogbGxpbnQvTExJbnRPcGNvZGUuaDoKKyAgICAgICAgKiBs bGludC9MTEludFRodW5rcy5oOgorICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIu Y3BwOgorICAgICAgICAoSlNDOjpDTG9vcDo6ZXhlY3V0ZSk6CisgICAgICAgICogbGxpbnQvTG93 TGV2ZWxJbnRlcnByZXRlcjY0LmFzbToKKyAgICAgICAgKiBvZmZsaW5lYXNtL2Nsb29wLnJiOgor CiAyMDEzLTEyLTExICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBJ bnRyb2R1Y2luZyBNYXhGcmFtZUV4dGVudEZvclNsb3dQYXRoQ2FsbC5oLgpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCShyZXZp c2lvbiAxNjA0NjkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJw cmV0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NTksNyArNDU5LDcgQEAgc3RhdGljIGJvb2wg dW53aW5kQ2FsbEZyYW1lKFN0YWNrVmlzaXRvcgogICAgICAgICBpZiAoY2FsbGVyRnJhbWUtPnZt RW50cnlTZW50aW5lbENhbGxlckZyYW1lKCkpCiAgICAgICAgICAgICBjYWxsRnJhbWUtPnZtKCku dG9wQ2FsbEZyYW1lID0gY2FsbGVyRnJhbWUtPnZtRW50cnlTZW50aW5lbENhbGxlckZyYW1lKCk7 CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGNhbGxGcmFtZS0+dm0oKS50b3BDYWxsRnJhbWUg PSBjYWxsRnJhbWU7IC8vIF9yZXR1cm5Gcm9tSmF2YVNjcmlwdCB3aWxsIHBvcCB0aGUgZnJhbWUg b2ZmLgorICAgICAgICAgICAgY2FsbEZyYW1lLT52bSgpLnRvcENhbGxGcmFtZSA9IGNhbGxGcmFt ZTsgLy8gX2hhbmRsZVVuY2F1Z2h0RXhjZXB0aW9uIHdpbGwgcG9wIHRoZSBmcmFtZSBvZmYuCiAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAgICAgcmV0dXJuIHRydWU7CkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVEV4Y2VwdGlvbnMuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklURXhjZXB0aW9ucy5jcHAJKHJldmlzaW9uIDE2MDQ2 OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklURXhjZXB0aW9ucy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTU2LDcgKzU2LDcgQEAgdm9pZCBnZW5lcmljVW53aW5kKFZNKiB2bSwgRXhl Y1N0YXRlKiBjYQogICAgICAgICBjYXRjaFJvdXRpbmUgPSBjYXRjaFBDRm9ySW50ZXJwcmV0ZXIt PnUucG9pbnRlcjsKICNlbmRpZgogICAgIH0gZWxzZQotICAgICAgICBjYXRjaFJvdXRpbmUgPSBM TEludDo6Z2V0Q29kZVB0cihyZXR1cm5Gcm9tSmF2YVNjcmlwdCk7CisgICAgICAgIGNhdGNoUm91 dGluZSA9IExMSW50OjpnZXRDb2RlUHRyKGhhbmRsZVVuY2F1Z2h0RXhjZXB0aW9uKTsKICAgICAK ICAgICB2bS0+Y2FsbEZyYW1lRm9yVGhyb3cgPSBjYWxsRnJhbWU7CiAgICAgdm0tPnRhcmdldE1h Y2hpbmVQQ0ZvclRocm93ID0gY2F0Y2hSb3V0aW5lOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9KSVRTdHVicy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklUU3R1YnMuaAkocmV2aXNpb24gMTYwNDY5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9KSVRTdHVicy5oCSh3b3JraW5nIGNvcHkpCkBAIC00Myw3ICs0Myw3IEBAIHN0cnVjdCBQ cm90b0NhbGxGcmFtZTsKIAogZXh0ZXJuICJDIiB7CiAgICAgRW5jb2RlZEpTVmFsdWUgY2FsbFRv SmF2YVNjcmlwdCh2b2lkKiwgRXhlY1N0YXRlKiosIFByb3RvQ2FsbEZyYW1lKiwgUmVnaXN0ZXIq KTsKLSAgICB2b2lkIHJldHVybkZyb21KYXZhU2NyaXB0KCk7CisgICAgdm9pZCBoYW5kbGVVbmNh dWdodEV4Y2VwdGlvbigpOwogICAgIEVuY29kZWRKU1ZhbHVlIGNhbGxUb05hdGl2ZUZ1bmN0aW9u KHZvaWQqLCBFeGVjU3RhdGUqKiwgUHJvdG9DYWxsRnJhbWUqLCBSZWdpc3RlciopOwogfQogI2Vu ZGlmCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzTVNWQzY0LmFzbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzTVNWQzY0LmFz bQkocmV2aXNpb24gMTYwNDY5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVi c01TVkM2NC5hc20JKHdvcmtpbmcgY29weSkKQEAgLTI2LDcgKzI2LDcgQEAKIEVYVEVSTiBnZXRI b3N0Q2FsbFJldHVyblZhbHVlV2l0aEV4ZWNTdGF0ZSA6IG5lYXIKIAogUFVCTElDIGNhbGxUb0ph dmFTY3JpcHQKLVBVQkxJQyByZXR1cm5Gcm9tSmF2YVNjcmlwdAorUFVCTElDIGhhbmRsZVVuY2F1 Z2h0RXhjZXB0aW9uCiBQVUJMSUMgZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZQogCiBfVEVYVCAgIFNF R01FTlQKQEAgLTIzNSw3ICsyMzUsNyBAQCBjYWxsZWVGcmFtZVBvcHBlZDoKICAgICByZXQKIGNh bGxUb05hdGl2ZUZ1bmN0aW9uIEVORFAKIAotcmV0dXJuRnJvbUphdmFTY3JpcHQgUFJPQworaGFu ZGxlVW5jYXVnaHRFeGNlcHRpb24gUFJPQwogICAgIGFkZCByc3AsIDI4aAogICAgIHBvcCByZGkK ICAgICBwb3AgcnNpCkBAIC0yNDYsNyArMjQ2LDcgQEAgcmV0dXJuRnJvbUphdmFTY3JpcHQgUFJP QwogICAgIHBvcCByMTIKICAgICBwb3AgcmJwCiAgICAgcmV0Ci1yZXR1cm5Gcm9tSmF2YVNjcmlw dCBFTkRQCitoYW5kbGVVbmNhdWdodEV4Y2VwdGlvbiBFTkRQCiAJCiBnZXRIb3N0Q2FsbFJldHVy blZhbHVlIFBST0MKICAgICBtb3YgcmJwLCBbcmJwXSA7IENhbGxGcmFtZQpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVic1g4Ni5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnNYODYuaAkocmV2aXNpb24gMTYwNDY5KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVic1g4Ni5oCSh3b3JraW5nIGNvcHkpCkBAIC0z MDYsNyArMzA2LDcgQEAgZXh0ZXJuICJDIiB7CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBfX2Rl Y2xzcGVjKG5ha2VkKSB2b2lkIHJldHVybkZyb21KYXZhU2NyaXB0KCkKKyAgICBfX2RlY2xzcGVj KG5ha2VkKSB2b2lkIGhhbmRsZVVuY2F1Z2h0RXhjZXB0aW9uKCkKICAgICB7CiAgICAgICAgIF9f YXNtIHsKICAgICAgICAgICAgIGFkZCBlc3AsIDB4MWM7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvbGxpbnQvTExJbnRPcGNvZGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvbGxpbnQvTExJbnRPcGNvZGUuaAkocmV2aXNpb24gMTYwNDY5KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2xsaW50L0xMSW50T3Bjb2RlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM0LDcg KzM0LDcgQEAKIAogI2RlZmluZSBGT1JfRUFDSF9MTElOVF9OT0pJVF9OQVRJVkVfSEVMUEVSKG1h Y3JvKSBcCiAgICAgbWFjcm8oZ2V0SG9zdENhbGxSZXR1cm5WYWx1ZSwgMSkgXAotICAgIG1hY3Jv KHJldHVybkZyb21KYXZhU2NyaXB0LCAxKQorICAgIG1hY3JvKGhhbmRsZVVuY2F1Z2h0RXhjZXB0 aW9uLCAxKQogCiAjZWxzZSAvLyAhRU5BQkxFKExMSU5UX0NfTE9PUCkKIApJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50VGh1bmtzLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2xsaW50L0xMSW50VGh1bmtzLmgJKHJldmlzaW9uIDE2MDQ2OSkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9MTEludFRodW5rcy5oCSh3b3JraW5nIGNvcHkp CkBAIC00Myw3ICs0Myw3IEBAIGV4dGVybiAiQyIgewogICAgIEVuY29kZWRKU1ZhbHVlIGNhbGxU b0phdmFTY3JpcHQodm9pZCosIEV4ZWNTdGF0ZSoqLCBQcm90b0NhbGxGcmFtZSosIFJlZ2lzdGVy Kik7CiAgICAgRW5jb2RlZEpTVmFsdWUgY2FsbFRvTmF0aXZlRnVuY3Rpb24odm9pZCosIEV4ZWNT dGF0ZSoqLCBQcm90b0NhbGxGcmFtZSosIFJlZ2lzdGVyKik7CiAjaWYgRU5BQkxFKEpJVCkKLSAg ICB2b2lkIHJldHVybkZyb21KYXZhU2NyaXB0KCk7CisgICAgdm9pZCBoYW5kbGVVbmNhdWdodEV4 Y2VwdGlvbigpOwogI2VuZGlmCiB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGlu dC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCShyZXZpc2lvbiAxNjA0Njkp CisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlcjY0LmFz bQkod29ya2luZyBjb3B5KQpAQCAtMjkwLDcgKzI5MCw3IEBAIG1hY3JvIG1ha2VIb3N0RnVuY3Rp b25DYWxsKGVudHJ5LCB0ZW1wKQogZW5kCiAKIAotX3JldHVybkZyb21KYXZhU2NyaXB0OgorX2hh bmRsZVVuY2F1Z2h0RXhjZXB0aW9uOgogICAgIHN1YnAgMTYsIHNwCiAKICAgICBjaGVja1N0YWNr UG9pbnRlckFsaWdubWVudCh0MywgMHhiYWQwZWVlZSkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvbGxpbnQvTG93TGV2ZWxJbnRlcnByZXRlci5jcHAJKHJldmlzaW9uIDE2 MDQ2OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzA4LDcgKzMwOCw3IEBAIEpTVmFsdWUgQ0xvb3A6OmV4 ZWN1dGUoQ2FsbEZyYW1lKiBjYWxsRnIKICAgICAvLyAyLiAzMiBiaXQgcmVzdWx0IHZhbHVlcyB3 aWxsIGJlIGluIHRoZSBsb3cgMzItYml0IG9mIHQwLgogICAgIC8vIDMuIDY0IGJpdCByZXN1bHQg dmFsdWVzIHdpbGwgYmUgaW4gdDAuCiAKLSAgICBDTG9vcFJlZ2lzdGVyIHQwLCB0MSwgdDIsIHQz OworICAgIENMb29wUmVnaXN0ZXIgdDAsIHQxLCB0MiwgdDMsIHQ1LCBzcDsKICNpZiBVU0UoSlNW QUxVRTY0KQogICAgIENMb29wUmVnaXN0ZXIgckJhc2VQQywgdGFnVHlwZU51bWJlciwgdGFnTWFz azsKICNlbmRpZgpAQCAtNDMxLDcgKzQzMSw3IEBAIEpTVmFsdWUgQ0xvb3A6OmV4ZWN1dGUoQ2Fs bEZyYW1lKiBjYWxsRnIKICAgICAgICAgICAgIGdvdG8gZG9SZXR1cm5IZWxwZXI7CiAgICAgICAg IH0KIAotICAgICAgICBPRkZMSU5FX0FTTV9HTFVFX0xBQkVMKHJldHVybkZyb21KYXZhU2NyaXB0 KQorICAgICAgICBPRkZMSU5FX0FTTV9HTFVFX0xBQkVMKGhhbmRsZVVuY2F1Z2h0RXhjZXB0aW9u KQogICAgICAgICB7CiAgICAgICAgICAgICByZXR1cm4gdm0tPmV4Y2VwdGlvbigpOwogICAgICAg ICB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9jbG9vcC5yYgo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9jbG9vcC5yYgkocmV2 aXNpb24gMTYwNDY5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vY2xvb3Au cmIJKHdvcmtpbmcgY29weSkKQEAgLTk0LDYgKzk0LDggQEAgY2xhc3MgUmVnaXN0ZXJJRAogICAg ICAgICAgICAgInQzIgogICAgICAgICB3aGVuICJ0NCIKICAgICAgICAgICAgICJyUEMiCisgICAg ICAgIHdoZW4gInQ1IgorICAgICAgICAgICAgInQ1IgogICAgICAgICB3aGVuICJ0NiIKICAgICAg ICAgICAgICJyQmFzZVBDIgogICAgICAgICB3aGVuICJjc3IxIgpAQCAtMTA5Nyw2ICsxMDk5LDgg QEAgY2xhc3MgSW5zdHJ1Y3Rpb24KICAgICAgICAgICAgIGNsb29wRW1pdE9wQW5kQnJhbmNoKG9w ZXJhbmRzLCAifCIsIDppbnQzMiwgIiE9IDAiKQogICAgICAgICAgICAgCiAgICAgICAgIHdoZW4g Im1lbWZlbmNlIgorICAgICAgICB3aGVuICJwb3AiCisgICAgICAgICAgICAkYXNtLnB1dGMgIiNl cnJvciBGSVhNRTogTmVlZCBpbXBsZW1lbnRhdGlvbiBmb3IgcG9wIgogICAgICAgICB3aGVuICJw dXNoQ2FsbGVlU2F2ZXMiCiAgICAgICAgIHdoZW4gInBvcENhbGxlZVNhdmVzIgogCg== 219031 2013-12-11 19:13:54 -0800 2013-12-12 10:50:53 -0800 patch 2: missed LowLevelInterpreter32_64.asm bug-125613.patch text/plain 8247 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYwNDc0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBA CisyMDEzLTEyLTExICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgcmV0dXJuRnJvbUphdmFTY3JpcHQgdG8gaGFuZGxlVW5jYXVnaHRFeGNlcHRpb24uCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU2MTMuCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbyBkaWQg YSBmZXcgbWlub3IgZml4ZXMgdG8gZ2V0IHRoZSBDIExvb3AgTExJTlQgb2ZmbGluZSBhc20gc3Rh Z2UKKyAgICAgICAgdG8gYnVpbGQgcHJvcGVybHksIGFuZCBhbHNvIHNvbWUgdHJpdmlhbCBjaGFu Z2VzIHRvIG1pbmltaXplIHRoZQorICAgICAgICBjb21waWxlIGVycm9ycyBmb3IgTG93TGV2ZWxJ bnRlcnByZXRlci5jcHAuIEl0IGRvZXNuJ3QgYnVpbGQgY29tcGxldGVseQorICAgICAgICBhbmQg cnVuIHlldCBzaW5jZSB3ZSdsbCBuZWVkIHRvIHVwZGF0ZSBpdCBmb3IgQ1N0YWNrIGNoYW5nZXMg dGhhdCBoYXZlCisgICAgICAgIG5vdCBiZWVuIGltcGxlbWVudGVkIGZvciB0aGUgQyBMb29wIExM SU5UIHlldC4KKworICAgICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVyLmNwcDoKKyAgICAg ICAgKEpTQzo6dW53aW5kQ2FsbEZyYW1lKToKKyAgICAgICAgKiBqaXQvSklURXhjZXB0aW9ucy5j cHA6CisgICAgICAgIChKU0M6OmdlbmVyaWNVbndpbmQpOgorICAgICAgICAqIGppdC9KSVRTdHVi cy5oOgorICAgICAgICAqIGppdC9KSVRTdHVic01TVkM2NC5hc206CisgICAgICAgICogaml0L0pJ VFN0dWJzWDg2Lmg6CisgICAgICAgICogbGxpbnQvTExJbnRPcGNvZGUuaDoKKyAgICAgICAgKiBs bGludC9MTEludFRodW5rcy5oOgorICAgICAgICAqIGxsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIu Y3BwOgorICAgICAgICAoSlNDOjpDTG9vcDo6ZXhlY3V0ZSk6CisgICAgICAgICogbGxpbnQvTG93 TGV2ZWxJbnRlcnByZXRlcjMyXzY0LmFzbToKKyAgICAgICAgKiBsbGludC9Mb3dMZXZlbEludGVy cHJldGVyNjQuYXNtOgorICAgICAgICAqIG9mZmxpbmVhc20vY2xvb3AucmI6CisKIDIwMTMtMTIt MTEgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEludHJvZHVjaW5n IE1heEZyYW1lRXh0ZW50Rm9yU2xvd1BhdGhDYWxsLmguCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAJKHJldmlzaW9uIDE2MDQ2 OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTQ1OSw3ICs0NTksNyBAQCBzdGF0aWMgYm9vbCB1bndpbmRDYWxs RnJhbWUoU3RhY2tWaXNpdG9yCiAgICAgICAgIGlmIChjYWxsZXJGcmFtZS0+dm1FbnRyeVNlbnRp bmVsQ2FsbGVyRnJhbWUoKSkKICAgICAgICAgICAgIGNhbGxGcmFtZS0+dm0oKS50b3BDYWxsRnJh bWUgPSBjYWxsZXJGcmFtZS0+dm1FbnRyeVNlbnRpbmVsQ2FsbGVyRnJhbWUoKTsKICAgICAgICAg ZWxzZQotICAgICAgICAgICAgY2FsbEZyYW1lLT52bSgpLnRvcENhbGxGcmFtZSA9IGNhbGxGcmFt ZTsgLy8gX3JldHVybkZyb21KYXZhU2NyaXB0IHdpbGwgcG9wIHRoZSBmcmFtZSBvZmYuCisgICAg ICAgICAgICBjYWxsRnJhbWUtPnZtKCkudG9wQ2FsbEZyYW1lID0gY2FsbEZyYW1lOyAvLyBfaGFu ZGxlVW5jYXVnaHRFeGNlcHRpb24gd2lsbCBwb3AgdGhlIGZyYW1lIG9mZi4KICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIH0KICAgICByZXR1cm4gdHJ1ZTsKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9qaXQvSklURXhjZXB0aW9ucy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2ppdC9KSVRFeGNlcHRpb25zLmNwcAkocmV2aXNpb24gMTYwNDY5KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRFeGNlcHRpb25zLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNTYsNyArNTYsNyBAQCB2b2lkIGdlbmVyaWNVbndpbmQoVk0qIHZtLCBFeGVjU3RhdGUqIGNh CiAgICAgICAgIGNhdGNoUm91dGluZSA9IGNhdGNoUENGb3JJbnRlcnByZXRlci0+dS5wb2ludGVy OwogI2VuZGlmCiAgICAgfSBlbHNlCi0gICAgICAgIGNhdGNoUm91dGluZSA9IExMSW50OjpnZXRD b2RlUHRyKHJldHVybkZyb21KYXZhU2NyaXB0KTsKKyAgICAgICAgY2F0Y2hSb3V0aW5lID0gTExJ bnQ6OmdldENvZGVQdHIoaGFuZGxlVW5jYXVnaHRFeGNlcHRpb24pOwogICAgIAogICAgIHZtLT5j YWxsRnJhbWVGb3JUaHJvdyA9IGNhbGxGcmFtZTsKICAgICB2bS0+dGFyZ2V0TWFjaGluZVBDRm9y VGhyb3cgPSBjYXRjaFJvdXRpbmU7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJ VFN0dWJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRTdHVi cy5oCShyZXZpc2lvbiAxNjA0NjkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0 dWJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcgKzQzLDcgQEAgc3RydWN0IFByb3RvQ2FsbEZy YW1lOwogCiBleHRlcm4gIkMiIHsKICAgICBFbmNvZGVkSlNWYWx1ZSBjYWxsVG9KYXZhU2NyaXB0 KHZvaWQqLCBFeGVjU3RhdGUqKiwgUHJvdG9DYWxsRnJhbWUqLCBSZWdpc3RlciopOwotICAgIHZv aWQgcmV0dXJuRnJvbUphdmFTY3JpcHQoKTsKKyAgICB2b2lkIGhhbmRsZVVuY2F1Z2h0RXhjZXB0 aW9uKCk7CiAgICAgRW5jb2RlZEpTVmFsdWUgY2FsbFRvTmF0aXZlRnVuY3Rpb24odm9pZCosIEV4 ZWNTdGF0ZSoqLCBQcm90b0NhbGxGcmFtZSosIFJlZ2lzdGVyKik7CiB9CiAjZW5kaWYKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnNNU1ZDNjQuYXNtCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUU3R1YnNNU1ZDNjQuYXNtCShyZXZpc2lv biAxNjA0NjkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVFN0dWJzTVNWQzY0LmFz bQkod29ya2luZyBjb3B5KQpAQCAtMjYsNyArMjYsNyBAQAogRVhURVJOIGdldEhvc3RDYWxsUmV0 dXJuVmFsdWVXaXRoRXhlY1N0YXRlIDogbmVhcgogCiBQVUJMSUMgY2FsbFRvSmF2YVNjcmlwdAot UFVCTElDIHJldHVybkZyb21KYXZhU2NyaXB0CitQVUJMSUMgaGFuZGxlVW5jYXVnaHRFeGNlcHRp b24KIFBVQkxJQyBnZXRIb3N0Q2FsbFJldHVyblZhbHVlCiAKIF9URVhUICAgU0VHTUVOVApAQCAt MjM1LDcgKzIzNSw3IEBAIGNhbGxlZUZyYW1lUG9wcGVkOgogICAgIHJldAogY2FsbFRvTmF0aXZl RnVuY3Rpb24gRU5EUAogCi1yZXR1cm5Gcm9tSmF2YVNjcmlwdCBQUk9DCitoYW5kbGVVbmNhdWdo dEV4Y2VwdGlvbiBQUk9DCiAgICAgYWRkIHJzcCwgMjhoCiAgICAgcG9wIHJkaQogICAgIHBvcCBy c2kKQEAgLTI0Niw3ICsyNDYsNyBAQCByZXR1cm5Gcm9tSmF2YVNjcmlwdCBQUk9DCiAgICAgcG9w IHIxMgogICAgIHBvcCByYnAKICAgICByZXQKLXJldHVybkZyb21KYXZhU2NyaXB0IEVORFAKK2hh bmRsZVVuY2F1Z2h0RXhjZXB0aW9uIEVORFAKIAkKIGdldEhvc3RDYWxsUmV0dXJuVmFsdWUgUFJP QwogICAgIG1vdiByYnAsIFtyYnBdIDsgQ2FsbEZyYW1lCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVFN0dWJzWDg2LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9KSVRTdHVic1g4Ni5oCShyZXZpc2lvbiAxNjA0NjkpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0pJVFN0dWJzWDg2LmgJKHdvcmtpbmcgY29weSkKQEAgLTMwNiw3ICszMDYs NyBAQCBleHRlcm4gIkMiIHsKICAgICAgICAgfQogICAgIH0KIAotICAgIF9fZGVjbHNwZWMobmFr ZWQpIHZvaWQgcmV0dXJuRnJvbUphdmFTY3JpcHQoKQorICAgIF9fZGVjbHNwZWMobmFrZWQpIHZv aWQgaGFuZGxlVW5jYXVnaHRFeGNlcHRpb24oKQogICAgIHsKICAgICAgICAgX19hc20gewogICAg ICAgICAgICAgYWRkIGVzcCwgMHgxYzsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGlu dC9MTEludE9wY29kZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGlu dC9MTEludE9wY29kZS5oCShyZXZpc2lvbiAxNjA0NjkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvbGxpbnQvTExJbnRPcGNvZGUuaAkod29ya2luZyBjb3B5KQpAQCAtMzQsNyArMzQsNyBAQAog CiAjZGVmaW5lIEZPUl9FQUNIX0xMSU5UX05PSklUX05BVElWRV9IRUxQRVIobWFjcm8pIFwKICAg ICBtYWNybyhnZXRIb3N0Q2FsbFJldHVyblZhbHVlLCAxKSBcCi0gICAgbWFjcm8ocmV0dXJuRnJv bUphdmFTY3JpcHQsIDEpCisgICAgbWFjcm8oaGFuZGxlVW5jYXVnaHRFeGNlcHRpb24sIDEpCiAK ICNlbHNlIC8vICFFTkFCTEUoTExJTlRfQ19MT09QKQogCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvbGxpbnQvTExJbnRUaHVua3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvbGxpbnQvTExJbnRUaHVua3MuaAkocmV2aXNpb24gMTYwNDY5KQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2xsaW50L0xMSW50VGh1bmtzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcg KzQzLDcgQEAgZXh0ZXJuICJDIiB7CiAgICAgRW5jb2RlZEpTVmFsdWUgY2FsbFRvSmF2YVNjcmlw dCh2b2lkKiwgRXhlY1N0YXRlKiosIFByb3RvQ2FsbEZyYW1lKiwgUmVnaXN0ZXIqKTsKICAgICBF bmNvZGVkSlNWYWx1ZSBjYWxsVG9OYXRpdmVGdW5jdGlvbih2b2lkKiwgRXhlY1N0YXRlKiosIFBy b3RvQ2FsbEZyYW1lKiwgUmVnaXN0ZXIqKTsKICNpZiBFTkFCTEUoSklUKQotICAgIHZvaWQgcmV0 dXJuRnJvbUphdmFTY3JpcHQoKTsKKyAgICB2b2lkIGhhbmRsZVVuY2F1Z2h0RXhjZXB0aW9uKCk7 CiAjZW5kaWYKIH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVs SW50ZXJwcmV0ZXIzMl82NC5hc20KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIzMl82NC5hc20JKHJldmlzaW9uIDE2MDQ2OSkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyMzJfNjQuYXNt CSh3b3JraW5nIGNvcHkpCkBAIC0zNDMsOCArMzQzLDggQEAgbWFjcm8gbWFrZUhvc3RGdW5jdGlv bkNhbGwoZW50cnksIHRlbXApCiAgICAgY2FsbCB0ZW1wCiBlbmQKIAotbWFjcm8gZG9SZXR1cm5G cm9tSmF2YVNjcmlwdChleHRyYVN0YWNrU3BhY2UpCi1fcmV0dXJuRnJvbUphdmFTY3JpcHQ6Citt YWNybyBkb0hhbmRsZVVuY2F1Z2h0RXhjZXB0aW9uKGV4dHJhU3RhY2tTcGFjZSkKK19oYW5kbGVV bmNhdWdodEV4Y2VwdGlvbjoKICAgICBmdW5jdGlvbkVwaWxvZ3VlKGV4dHJhU3RhY2tTcGFjZSkK ICAgICByZXQKIGVuZApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVs SW50ZXJwcmV0ZXI2NC5hc20KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2xs aW50L0xvd0xldmVsSW50ZXJwcmV0ZXI2NC5hc20JKHJldmlzaW9uIDE2MDQ2OSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyNjQuYXNtCSh3b3JraW5n IGNvcHkpCkBAIC0yOTAsNyArMjkwLDcgQEAgbWFjcm8gbWFrZUhvc3RGdW5jdGlvbkNhbGwoZW50 cnksIHRlbXApCiBlbmQKIAogCi1fcmV0dXJuRnJvbUphdmFTY3JpcHQ6CitfaGFuZGxlVW5jYXVn aHRFeGNlcHRpb246CiAgICAgc3VicCAxNiwgc3AKIAogICAgIGNoZWNrU3RhY2tQb2ludGVyQWxp Z25tZW50KHQzLCAweGJhZDBlZWVlKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50 L0xvd0xldmVsSW50ZXJwcmV0ZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9sbGludC9Mb3dMZXZlbEludGVycHJldGVyLmNwcAkocmV2aXNpb24gMTYwNDY5KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2xsaW50L0xvd0xldmVsSW50ZXJwcmV0ZXIuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMDgsNyArMzA4LDcgQEAgSlNWYWx1ZSBDTG9vcDo6ZXhlY3V0ZShDYWxs RnJhbWUqIGNhbGxGcgogICAgIC8vIDIuIDMyIGJpdCByZXN1bHQgdmFsdWVzIHdpbGwgYmUgaW4g dGhlIGxvdyAzMi1iaXQgb2YgdDAuCiAgICAgLy8gMy4gNjQgYml0IHJlc3VsdCB2YWx1ZXMgd2ls bCBiZSBpbiB0MC4KIAotICAgIENMb29wUmVnaXN0ZXIgdDAsIHQxLCB0MiwgdDM7CisgICAgQ0xv b3BSZWdpc3RlciB0MCwgdDEsIHQyLCB0MywgdDUsIHNwOwogI2lmIFVTRShKU1ZBTFVFNjQpCiAg ICAgQ0xvb3BSZWdpc3RlciByQmFzZVBDLCB0YWdUeXBlTnVtYmVyLCB0YWdNYXNrOwogI2VuZGlm CkBAIC00MzEsNyArNDMxLDcgQEAgSlNWYWx1ZSBDTG9vcDo6ZXhlY3V0ZShDYWxsRnJhbWUqIGNh bGxGcgogICAgICAgICAgICAgZ290byBkb1JldHVybkhlbHBlcjsKICAgICAgICAgfQogCi0gICAg ICAgIE9GRkxJTkVfQVNNX0dMVUVfTEFCRUwocmV0dXJuRnJvbUphdmFTY3JpcHQpCisgICAgICAg IE9GRkxJTkVfQVNNX0dMVUVfTEFCRUwoaGFuZGxlVW5jYXVnaHRFeGNlcHRpb24pCiAgICAgICAg IHsKICAgICAgICAgICAgIHJldHVybiB2bS0+ZXhjZXB0aW9uKCk7CiAgICAgICAgIH0KSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2Nsb29wLnJiCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2Nsb29wLnJiCShyZXZpc2lvbiAxNjA0 NjkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9jbG9vcC5yYgkod29ya2lu ZyBjb3B5KQpAQCAtOTQsNiArOTQsOCBAQCBjbGFzcyBSZWdpc3RlcklECiAgICAgICAgICAgICAi dDMiCiAgICAgICAgIHdoZW4gInQ0IgogICAgICAgICAgICAgInJQQyIKKyAgICAgICAgd2hlbiAi dDUiCisgICAgICAgICAgICAidDUiCiAgICAgICAgIHdoZW4gInQ2IgogICAgICAgICAgICAgInJC YXNlUEMiCiAgICAgICAgIHdoZW4gImNzcjEiCkBAIC0xMDk3LDYgKzEwOTksOCBAQCBjbGFzcyBJ bnN0cnVjdGlvbgogICAgICAgICAgICAgY2xvb3BFbWl0T3BBbmRCcmFuY2gob3BlcmFuZHMsICJ8 IiwgOmludDMyLCAiIT0gMCIpCiAgICAgICAgICAgICAKICAgICAgICAgd2hlbiAibWVtZmVuY2Ui CisgICAgICAgIHdoZW4gInBvcCIKKyAgICAgICAgICAgICRhc20ucHV0YyAiI2Vycm9yIEZJWE1F OiBOZWVkIGltcGxlbWVudGF0aW9uIGZvciBwb3AiCiAgICAgICAgIHdoZW4gInB1c2hDYWxsZWVT YXZlcyIKICAgICAgICAgd2hlbiAicG9wQ2FsbGVlU2F2ZXMiCiAK