62605 2011-06-13 15:42:41 -0700 Fix llocp and lvalp names in the lexer to something more meaningful 2011-06-13 15:48:23 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 oliver oliver barraclough oldest_to_newest 419996 0 oliver 2011-06-13 15:42:41 -0700 Fix llocp and lvalp names in the lexer to something more meaningful 419998 1 barraclough 2011-06-13 15:43:57 -0700 r+ even though there is no patch yet! :-D 419999 2 97021 oliver 2011-06-13 15:44:27 -0700 Created attachment 97021 Patch 420008 3 oliver 2011-06-13 15:48:23 -0700 Committed r88724: <http://trac.webkit.org/changeset/88724> 97021 2011-06-13 15:44:27 -0700 2011-06-13 15:45:19 -0700 Patch bug-62605-20110613154426.patch text/plain 10181 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogODg3MTkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDMw Y2UwMmQ0NTRiMDkyYWVmY2ViZTkzODY1NmRiOGNjMTJiNThiZjEuLjIyM2I2NGU0ZTFiZTRmY2E4 Y2Q1ODUzZmZhZjc0NThlNGVjYWMyMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDIxIEBACiAyMDExLTA2LTEzICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IGxsb2Nw IGFuZCBsdmFscCBuYW1lcyBpbiB0aGUgbGV4ZXIgdG8gc29tZXRoaW5nIG1vcmUgbWVhbmluZ2Z1 bAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI2MDUK KworICAgICAgICBBIHNpbXBsZSByZW5hbWUKKworICAgICAgICAqIHBhcnNlci9MZXhlci5jcHA6 CisgICAgICAgIChKU0M6OkxleGVyOjpwYXJzZUlkZW50aWZpZXIpOgorICAgICAgICAoSlNDOjpM ZXhlcjo6cGFyc2VTdHJpbmcpOgorICAgICAgICAoSlNDOjpMZXhlcjo6bGV4KToKKyAgICAgICAg KiBwYXJzZXIvTGV4ZXIuaDoKKyAgICAgICAgKEpTQzo6TGV4ZXI6OmxleEV4cGVjdElkZW50aWZp ZXIpOgorCisyMDExLTA2LTEzICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CisKICAg ICAgICAgUmV2aWV3ZWQgYnkgR2F2aW4gQmFycmFjbG91Z2guCiAKICAgICAgICAgTWFrZSBpdCBw b3NzaWJsZSB0byBpbmxpbmUgdGhlIGNvbW1vbiBjYXNlIG9mIGlkZW50aWZpZXIgbGV4aW5nCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL0xleGVyLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIuY3BwCmluZGV4IGIyNzA0NTVjOTI3MGZhNWI4 OTY4MDhhY2FkODE5N2ZkMWYxMTA0YWMuLjY4Y2M4ZDE4NjFjMDYwZDE5MmQwOGM5YjFkOWZmMDY4 OGI2ZGU4YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIu Y3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIuY3BwCkBAIC00MDUs MTMgKzQwNSwxMyBAQCBpbmxpbmUgdm9pZCBMZXhlcjo6cmVjb3JkMTYoaW50IGMpCiAgICAgcmVj b3JkMTYoVUNoYXIoc3RhdGljX2Nhc3Q8dW5zaWduZWQgc2hvcnQ+KGMpKSk7CiB9CiAKLXRlbXBs YXRlIDxib29sIHNob3VsZENyZWF0ZUlkZW50aWZpZXI+IEFMV0FZU19JTkxJTkUgSlNUb2tlblR5 cGUgTGV4ZXI6OnBhcnNlSWRlbnRpZmllcihKU1Rva2VuRGF0YSogbHZhbHAsIHVuc2lnbmVkIGxl eFR5cGUpCit0ZW1wbGF0ZSA8Ym9vbCBzaG91bGRDcmVhdGVJZGVudGlmaWVyPiBBTFdBWVNfSU5M SU5FIEpTVG9rZW5UeXBlIExleGVyOjpwYXJzZUlkZW50aWZpZXIoSlNUb2tlbkRhdGEqIHRva2Vu RGF0YSwgdW5zaWduZWQgbGV4VHlwZSkKIHsKICAgICBjb25zdCBwdHJkaWZmX3QgcmVtYWluaW5n ID0gbV9jb2RlRW5kIC0gbV9jb2RlOwogICAgIGlmICgocmVtYWluaW5nID49IG1heFRva2VuTGVu Z3RoKSAmJiAhKGxleFR5cGUgJiBJZ25vcmVSZXNlcnZlZFdvcmRzKSkgewotICAgICAgICBKU1Rv a2VuVHlwZSBrZXl3b3JkID0gcGFyc2VLZXl3b3JkPHNob3VsZENyZWF0ZUlkZW50aWZpZXI+KGx2 YWxwKTsKKyAgICAgICAgSlNUb2tlblR5cGUga2V5d29yZCA9IHBhcnNlS2V5d29yZDxzaG91bGRD cmVhdGVJZGVudGlmaWVyPih0b2tlbkRhdGEpOwogICAgICAgICBpZiAoa2V5d29yZCAhPSBJREVO VCkgewotICAgICAgICAgICAgQVNTRVJUKCghc2hvdWxkQ3JlYXRlSWRlbnRpZmllcikgfHwgbHZh bHAtPmlkZW50KTsKKyAgICAgICAgICAgIEFTU0VSVCgoIXNob3VsZENyZWF0ZUlkZW50aWZpZXIp IHx8IHRva2VuRGF0YS0+aWRlbnQpOwogICAgICAgICAgICAgcmV0dXJuIGtleXdvcmQ7CiAgICAg ICAgIH0KICAgICB9CkBAIC00NTcsOSArNDU3LDkgQEAgdGVtcGxhdGUgPGJvb2wgc2hvdWxkQ3Jl YXRlSWRlbnRpZmllcj4gQUxXQVlTX0lOTElORSBKU1Rva2VuVHlwZSBMZXhlcjo6cGFyc2VJZGUK ICAgICAgICAgfQogCiAgICAgICAgIGlkZW50ID0gbWFrZUlkZW50aWZpZXIoaWRlbnRpZmllclN0 YXJ0LCBpZGVudGlmaWVyTGVuZ3RoKTsKLSAgICAgICAgbHZhbHAtPmlkZW50ID0gaWRlbnQ7Cisg ICAgICAgIHRva2VuRGF0YS0+aWRlbnQgPSBpZGVudDsKICAgICB9IGVsc2UKLSAgICAgICAgbHZh bHAtPmlkZW50ID0gMDsKKyAgICAgICAgdG9rZW5EYXRhLT5pZGVudCA9IDA7CiAKICAgICBtX2Rl bGltaXRlZCA9IGZhbHNlOwogCkBAIC00NzgsNyArNDc4LDcgQEAgdGVtcGxhdGUgPGJvb2wgc2hv dWxkQ3JlYXRlSWRlbnRpZmllcj4gQUxXQVlTX0lOTElORSBKU1Rva2VuVHlwZSBMZXhlcjo6cGFy c2VJZGUKICAgICByZXR1cm4gSURFTlQ7CiB9CiAKLXRlbXBsYXRlIDxib29sIHNob3VsZEJ1aWxk U3RyaW5ncz4gQUxXQVlTX0lOTElORSBib29sIExleGVyOjpwYXJzZVN0cmluZyhKU1Rva2VuRGF0 YSogbHZhbHAsIGJvb2wgc3RyaWN0TW9kZSkKK3RlbXBsYXRlIDxib29sIHNob3VsZEJ1aWxkU3Ry aW5ncz4gQUxXQVlTX0lOTElORSBib29sIExleGVyOjpwYXJzZVN0cmluZyhKU1Rva2VuRGF0YSog dG9rZW5EYXRhLCBib29sIHN0cmljdE1vZGUpCiB7CiAgICAgaW50IHN0cmluZ1F1b3RlQ2hhcmFj dGVyID0gbV9jdXJyZW50OwogICAgIHNoaWZ0KCk7CkBAIC01NzQsOSArNTc0LDkgQEAgdGVtcGxh dGUgPGJvb2wgc2hvdWxkQnVpbGRTdHJpbmdzPiBBTFdBWVNfSU5MSU5FIGJvb2wgTGV4ZXI6OnBh cnNlU3RyaW5nKEpTVG9rZW4KICAgICBpZiAoY3VycmVudENoYXJhY3RlcigpICE9IHN0cmluZ1N0 YXJ0ICYmIHNob3VsZEJ1aWxkU3RyaW5ncykKICAgICAgICAgbV9idWZmZXIxNi5hcHBlbmQoc3Ry aW5nU3RhcnQsIGN1cnJlbnRDaGFyYWN0ZXIoKSAtIHN0cmluZ1N0YXJ0KTsKICAgICBpZiAoc2hv dWxkQnVpbGRTdHJpbmdzKQotICAgICAgICBsdmFscC0+aWRlbnQgPSBtYWtlSWRlbnRpZmllciht X2J1ZmZlcjE2LmRhdGEoKSwgbV9idWZmZXIxNi5zaXplKCkpOworICAgICAgICB0b2tlbkRhdGEt PmlkZW50ID0gbWFrZUlkZW50aWZpZXIobV9idWZmZXIxNi5kYXRhKCksIG1fYnVmZmVyMTYuc2l6 ZSgpKTsKICAgICBlbHNlCi0gICAgICAgIGx2YWxwLT5pZGVudCA9IDA7CisgICAgICAgIHRva2Vu RGF0YS0+aWRlbnQgPSAwOwogCiAgICAgbV9idWZmZXIxNi5yZXNpemUoMCk7CiAgICAgcmV0dXJu IHRydWU7CkBAIC03NTIsNyArNzUyLDcgQEAgYm9vbCBMZXhlcjo6bmV4dFRva2VuSXNDb2xvbigp CiAgICAgcmV0dXJuIGNvZGUgPCBtX2NvZGVFbmQgJiYgKmNvZGUgPT0gJzonOwogfQogCi1KU1Rv a2VuVHlwZSBMZXhlcjo6bGV4KEpTVG9rZW5EYXRhKiBsdmFscCwgSlNUb2tlbkluZm8qIGxsb2Nw LCB1bnNpZ25lZCBsZXhUeXBlLCBib29sIHN0cmljdE1vZGUpCitKU1Rva2VuVHlwZSBMZXhlcjo6 bGV4KEpTVG9rZW5EYXRhKiB0b2tlbkRhdGEsIEpTVG9rZW5JbmZvKiB0b2tlbkluZm8sIHVuc2ln bmVkIGxleFR5cGUsIGJvb2wgc3RyaWN0TW9kZSkKIHsKICAgICBBU1NFUlQoIW1fZXJyb3IpOwog ICAgIEFTU0VSVChtX2J1ZmZlcjguaXNFbXB0eSgpKTsKQEAgLTEwMDcsMTIgKzEwMDcsMTIgQEAg c3RhcnQ6CiAgICAgICAgIHRva2VuID0gU0VNSUNPTE9OOwogICAgICAgICBicmVhazsKICAgICBj YXNlIENoYXJhY3Rlck9wZW5CcmFjZToKLSAgICAgICAgbHZhbHAtPmludFZhbHVlID0gY3VycmVu dE9mZnNldCgpOworICAgICAgICB0b2tlbkRhdGEtPmludFZhbHVlID0gY3VycmVudE9mZnNldCgp OwogICAgICAgICBzaGlmdCgpOwogICAgICAgICB0b2tlbiA9IE9QRU5CUkFDRTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBDaGFyYWN0ZXJDbG9zZUJyYWNlOgotICAgICAgICBsdmFscC0+aW50 VmFsdWUgPSBjdXJyZW50T2Zmc2V0KCk7CisgICAgICAgIHRva2VuRGF0YS0+aW50VmFsdWUgPSBj dXJyZW50T2Zmc2V0KCk7CiAgICAgICAgIG1fZGVsaW1pdGVkID0gdHJ1ZTsKICAgICAgICAgc2hp ZnQoKTsKICAgICAgICAgdG9rZW4gPSBDTE9TRUJSQUNFOwpAQCAtMTAyNywxMiArMTAyNywxMiBA QCBzdGFydDoKICAgICBjYXNlIENoYXJhY3Rlclplcm86CiAgICAgICAgIHNoaWZ0KCk7CiAgICAg ICAgIGlmICgobV9jdXJyZW50IHwgMHgyMCkgPT0gJ3gnICYmIGlzQVNDSUlIZXhEaWdpdChwZWVr KDEpKSkgewotICAgICAgICAgICAgcGFyc2VIZXgobHZhbHAtPmRvdWJsZVZhbHVlKTsKKyAgICAg ICAgICAgIHBhcnNlSGV4KHRva2VuRGF0YS0+ZG91YmxlVmFsdWUpOwogICAgICAgICAgICAgdG9r ZW4gPSBOVU1CRVI7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICByZWNvcmQ4KCcwJyk7 CiAgICAgICAgICAgICBpZiAoaXNBU0NJSU9jdGFsRGlnaXQobV9jdXJyZW50KSkgewotICAgICAg ICAgICAgICAgIGlmIChwYXJzZU9jdGFsKGx2YWxwLT5kb3VibGVWYWx1ZSkpIHsKKyAgICAgICAg ICAgICAgICBpZiAocGFyc2VPY3RhbCh0b2tlbkRhdGEtPmRvdWJsZVZhbHVlKSkgewogICAgICAg ICAgICAgICAgICAgICBpZiAoc3RyaWN0TW9kZSkKICAgICAgICAgICAgICAgICAgICAgICAgIGdv dG8gcmV0dXJuRXJyb3I7CiAgICAgICAgICAgICAgICAgICAgIHRva2VuID0gTlVNQkVSOwpAQCAt MTA0Miw3ICsxMDQyLDcgQEAgc3RhcnQ6CiAgICAgICAgIC8vIEZhbGwgdGhyb3VnaCBpbnRvIENo YXJhY3Rlck51bWJlcgogICAgIGNhc2UgQ2hhcmFjdGVyTnVtYmVyOgogICAgICAgICBpZiAoTElL RUxZKHRva2VuICE9IE5VTUJFUikpIHsKLSAgICAgICAgICAgIGlmICghcGFyc2VEZWNpbWFsKGx2 YWxwLT5kb3VibGVWYWx1ZSkpIHsKKyAgICAgICAgICAgIGlmICghcGFyc2VEZWNpbWFsKHRva2Vu RGF0YS0+ZG91YmxlVmFsdWUpKSB7CiAgICAgICAgICAgICAgICAgaWYgKG1fY3VycmVudCA9PSAn LicpIHsKICAgICAgICAgICAgICAgICAgICAgc2hpZnQoKTsKIGluTnVtYmVyQWZ0ZXJEZWNpbWFs UG9pbnQ6CkBAIC0xMDUzLDcgKzEwNTMsNyBAQCBpbk51bWJlckFmdGVyRGVjaW1hbFBvaW50Ogog ICAgICAgICAgICAgICAgICAgICAgICAgZ290byByZXR1cm5FcnJvcjsKICAgICAgICAgICAgICAg ICAvLyBOdWxsLXRlcm1pbmF0ZSBzdHJpbmcgZm9yIHN0cnRvZC4KICAgICAgICAgICAgICAgICBt X2J1ZmZlcjguYXBwZW5kKCdcMCcpOwotICAgICAgICAgICAgICAgIGx2YWxwLT5kb3VibGVWYWx1 ZSA9IFdURjo6c3RydG9kKG1fYnVmZmVyOC5kYXRhKCksIDApOworICAgICAgICAgICAgICAgIHRv a2VuRGF0YS0+ZG91YmxlVmFsdWUgPSBXVEY6OnN0cnRvZChtX2J1ZmZlcjguZGF0YSgpLCAwKTsK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRva2VuID0gTlVNQkVSOwogICAgICAgICB9CkBA IC0xMDY2LDEwICsxMDY2LDEwIEBAIGluTnVtYmVyQWZ0ZXJEZWNpbWFsUG9pbnQ6CiAgICAgICAg IGJyZWFrOwogICAgIGNhc2UgQ2hhcmFjdGVyUXVvdGU6CiAgICAgICAgIGlmIChsZXhUeXBlICYg RG9udEJ1aWxkU3RyaW5ncykgewotICAgICAgICAgICAgaWYgKFVOTElLRUxZKCFwYXJzZVN0cmlu ZzxmYWxzZT4obHZhbHAsIHN0cmljdE1vZGUpKSkKKyAgICAgICAgICAgIGlmIChVTkxJS0VMWSgh cGFyc2VTdHJpbmc8ZmFsc2U+KHRva2VuRGF0YSwgc3RyaWN0TW9kZSkpKQogICAgICAgICAgICAg ICAgIGdvdG8gcmV0dXJuRXJyb3I7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBpZiAo VU5MSUtFTFkoIXBhcnNlU3RyaW5nPHRydWU+KGx2YWxwLCBzdHJpY3RNb2RlKSkpCisgICAgICAg ICAgICBpZiAoVU5MSUtFTFkoIXBhcnNlU3RyaW5nPHRydWU+KHRva2VuRGF0YSwgc3RyaWN0TW9k ZSkpKQogICAgICAgICAgICAgICAgIGdvdG8gcmV0dXJuRXJyb3I7CiAgICAgICAgIH0KICAgICAg ICAgc2hpZnQoKTsKQEAgLTEwODEsOSArMTA4MSw5IEBAIGluTnVtYmVyQWZ0ZXJEZWNpbWFsUG9p bnQ6CiAgICAgICAgIC8vIEZhbGwgdGhyb3VnaCBpbnRvIENoYXJhY3RlckJhY2tTbGFzaC4KICAg ICBjYXNlIENoYXJhY3RlckJhY2tTbGFzaDoKICAgICAgICAgaWYgKGxleFR5cGUgJiBEb250QnVp bGRLZXl3b3JkcykKLSAgICAgICAgICAgIHRva2VuID0gcGFyc2VJZGVudGlmaWVyPGZhbHNlPihs dmFscCwgbGV4VHlwZSk7CisgICAgICAgICAgICB0b2tlbiA9IHBhcnNlSWRlbnRpZmllcjxmYWxz ZT4odG9rZW5EYXRhLCBsZXhUeXBlKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgdG9rZW4g PSBwYXJzZUlkZW50aWZpZXI8dHJ1ZT4obHZhbHAsIGxleFR5cGUpOworICAgICAgICAgICAgdG9r ZW4gPSBwYXJzZUlkZW50aWZpZXI8dHJ1ZT4odG9rZW5EYXRhLCBsZXhUeXBlKTsKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBDaGFyYWN0ZXJMaW5lVGVybWluYXRvcjoKICAgICAgICAgQVNTRVJU KGlzTGluZVRlcm1pbmF0b3IobV9jdXJyZW50KSk7CkBAIC0xMTE4LDkgKzExMTgsOSBAQCBpblNp bmdsZUxpbmVDb21tZW50OgogICAgIC8vIEZhbGwgdGhyb3VnaCBpbnRvIHJldHVyblRva2VuLgog CiByZXR1cm5Ub2tlbjoKLSAgICBsbG9jcC0+bGluZSA9IG1fbGluZU51bWJlcjsKLSAgICBsbG9j cC0+c3RhcnRPZmZzZXQgPSBzdGFydE9mZnNldDsKLSAgICBsbG9jcC0+ZW5kT2Zmc2V0ID0gY3Vy cmVudE9mZnNldCgpOworICAgIHRva2VuSW5mby0+bGluZSA9IG1fbGluZU51bWJlcjsKKyAgICB0 b2tlbkluZm8tPnN0YXJ0T2Zmc2V0ID0gc3RhcnRPZmZzZXQ7CisgICAgdG9rZW5JbmZvLT5lbmRP ZmZzZXQgPSBjdXJyZW50T2Zmc2V0KCk7CiAgICAgbV9sYXN0VG9rZW4gPSB0b2tlbjsKICAgICBy ZXR1cm4gdG9rZW47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIv TGV4ZXIuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTGV4ZXIuaAppbmRleCBiZDk2 OTBhYjlmNzc2MDk2MmIwNzE4ODQxMjk0NTAyN2M0NzY2OTJlLi4zNjE5YWUyNzdlYjdkNzE2NmZm NTUxMzk0MmU1NDQ4NTBiODAxNjUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cGFyc2VyL0xleGVyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9MZXhlci5o CkBAIC01Nyw3ICs1Nyw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgRG9udEJ1aWxk U3RyaW5ncyA9IDIsCiAgICAgICAgICAgICBEb250QnVpbGRLZXl3b3JkcyA9IDQKICAgICAgICAg fTsKLSAgICAgICAgSlNUb2tlblR5cGUgbGV4KEpTVG9rZW5EYXRhKiBsdmFscCwgSlNUb2tlbklu Zm8qIGxsb2NwLCB1bnNpZ25lZCwgYm9vbCBzdHJpY3RNb2RlKTsKKyAgICAgICAgSlNUb2tlblR5 cGUgbGV4KEpTVG9rZW5EYXRhKiwgSlNUb2tlbkluZm8qLCB1bnNpZ25lZCwgYm9vbCBzdHJpY3RN b2RlKTsKICAgICAgICAgYm9vbCBuZXh0VG9rZW5Jc0NvbG9uKCk7CiAgICAgICAgIGludCBsaW5l TnVtYmVyKCkgY29uc3QgeyByZXR1cm4gbV9saW5lTnVtYmVyOyB9CiAgICAgICAgIHZvaWQgc2V0 TGFzdExpbmVOdW1iZXIoaW50IGxhc3RMaW5lTnVtYmVyKSB7IG1fbGFzdExpbmVOdW1iZXIgPSBs YXN0TGluZU51bWJlcjsgfQpAQCAtODksNyArODksNyBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAg ICAgICBTb3VyY2VQcm92aWRlciogc291cmNlUHJvdmlkZXIoKSBjb25zdCB7IHJldHVybiBtX3Nv dXJjZS0+cHJvdmlkZXIoKTsgfQogICAgICAgICAKLSAgICAgICAgSlNUb2tlblR5cGUgbGV4RXhw ZWN0SWRlbnRpZmllcihKU1Rva2VuRGF0YSogbHZhbHAsIEpTVG9rZW5JbmZvKiBsbG9jcCwgdW5z aWduZWQsIGJvb2wgc3RyaWN0TW9kZSk7CisgICAgICAgIEpTVG9rZW5UeXBlIGxleEV4cGVjdElk ZW50aWZpZXIoSlNUb2tlbkRhdGEqLCBKU1Rva2VuSW5mbyosIHVuc2lnbmVkLCBib29sIHN0cmlj dE1vZGUpOwogICAgICAgICAKICAgICBwcml2YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgSlNH bG9iYWxEYXRhOwpAQCAtMTE5LDcgKzExOSw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB0 ZW1wbGF0ZSA8aW50IHNoaWZ0QW1vdW50LCBTaGlmdFR5cGUgc2hvdWxkQm91bmRzQ2hlY2s+IHZv aWQgaW50ZXJuYWxTaGlmdCgpOwogICAgICAgICB0ZW1wbGF0ZSA8Ym9vbCBzaG91bGRDcmVhdGVJ ZGVudGlmaWVyPiBBTFdBWVNfSU5MSU5FIEpTVG9rZW5UeXBlIHBhcnNlS2V5d29yZChKU1Rva2Vu RGF0YSopOwogICAgICAgICB0ZW1wbGF0ZSA8Ym9vbCBzaG91bGRCdWlsZElkZW50aWZpZXJzPiBB TFdBWVNfSU5MSU5FIEpTVG9rZW5UeXBlIHBhcnNlSWRlbnRpZmllcihKU1Rva2VuRGF0YSosIHVu c2lnbmVkKTsKLSAgICAgICAgdGVtcGxhdGUgPGJvb2wgc2hvdWxkQnVpbGRTdHJpbmdzPiBBTFdB WVNfSU5MSU5FIGJvb2wgcGFyc2VTdHJpbmcoSlNUb2tlbkRhdGEqIGx2YWxwLCBib29sIHN0cmlj dE1vZGUpOworICAgICAgICB0ZW1wbGF0ZSA8Ym9vbCBzaG91bGRCdWlsZFN0cmluZ3M+IEFMV0FZ U19JTkxJTkUgYm9vbCBwYXJzZVN0cmluZyhKU1Rva2VuRGF0YSosIGJvb2wgc3RyaWN0TW9kZSk7 CiAgICAgICAgIEFMV0FZU19JTkxJTkUgdm9pZCBwYXJzZUhleChkb3VibGUmIHJldHVyblZhbHVl KTsKICAgICAgICAgQUxXQVlTX0lOTElORSBib29sIHBhcnNlT2N0YWwoZG91YmxlJiByZXR1cm5W YWx1ZSk7CiAgICAgICAgIEFMV0FZU19JTkxJTkUgYm9vbCBwYXJzZURlY2ltYWwoZG91YmxlJiBy ZXR1cm5WYWx1ZSk7CkBAIC0xODEsNyArMTgxLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAg IHJldHVybiAmbV9hcmVuYS0+bWFrZUlkZW50aWZpZXIobV9nbG9iYWxEYXRhLCBjaGFyYWN0ZXJz LCBsZW5ndGgpOwogICAgIH0KIAotICAgIEFMV0FZU19JTkxJTkUgSlNUb2tlblR5cGUgTGV4ZXI6 OmxleEV4cGVjdElkZW50aWZpZXIoSlNUb2tlbkRhdGEqIGx2YWxwLCBKU1Rva2VuSW5mbyogbGxv Y3AsIHVuc2lnbmVkIGxleFR5cGUsIGJvb2wgc3RyaWN0TW9kZSkKKyAgICBBTFdBWVNfSU5MSU5F IEpTVG9rZW5UeXBlIExleGVyOjpsZXhFeHBlY3RJZGVudGlmaWVyKEpTVG9rZW5EYXRhKiB0b2tl bkRhdGEsIEpTVG9rZW5JbmZvKiB0b2tlbkluZm8sIHVuc2lnbmVkIGxleFR5cGUsIGJvb2wgc3Ry aWN0TW9kZSkKICAgICB7CiAgICAgICAgIEFTU0VSVCgobGV4VHlwZSAmIElnbm9yZVJlc2VydmVk V29yZHMpKTsKICAgICAgICAgY29uc3QgVUNoYXIqIHN0YXJ0ID0gbV9jb2RlOwpAQCAtMjEyLDE3 ICsyMTIsMTcgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAgICAgICAgLy8gQ3JlYXRlIHRoZSBpZGVu dGlmaWVyIGlmIG5lZWRlZAogICAgICAgICBpZiAobGV4VHlwZSAmIERvbnRCdWlsZEtleXdvcmRz KQotICAgICAgICAgICAgbHZhbHAtPmlkZW50ID0gMDsKKyAgICAgICAgICAgIHRva2VuRGF0YS0+ aWRlbnQgPSAwOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBsdmFscC0+aWRlbnQgPSBtYWtl SWRlbnRpZmllcihzdGFydCwgcHRyIC0gc3RhcnQpOwotICAgICAgICBsbG9jcC0+bGluZSA9IG1f bGluZU51bWJlcjsKLSAgICAgICAgbGxvY3AtPnN0YXJ0T2Zmc2V0ID0gc3RhcnQgLSBtX2NvZGVT dGFydDsKLSAgICAgICAgbGxvY3AtPmVuZE9mZnNldCA9IGN1cnJlbnRPZmZzZXQoKTsKKyAgICAg ICAgICAgIHRva2VuRGF0YS0+aWRlbnQgPSBtYWtlSWRlbnRpZmllcihzdGFydCwgcHRyIC0gc3Rh cnQpOworICAgICAgICB0b2tlbkluZm8tPmxpbmUgPSBtX2xpbmVOdW1iZXI7CisgICAgICAgIHRv a2VuSW5mby0+c3RhcnRPZmZzZXQgPSBzdGFydCAtIG1fY29kZVN0YXJ0OworICAgICAgICB0b2tl bkluZm8tPmVuZE9mZnNldCA9IGN1cnJlbnRPZmZzZXQoKTsKICAgICAgICAgbV9sYXN0VG9rZW4g PSBJREVOVDsKICAgICAgICAgcmV0dXJuIElERU5UOwogICAgICAgICAKICAgICBzbG93Q2FzZToK LSAgICAgICAgcmV0dXJuIGxleChsdmFscCwgbGxvY3AsIGxleFR5cGUsIHN0cmljdE1vZGUpOwor ICAgICAgICByZXR1cm4gbGV4KHRva2VuRGF0YSwgdG9rZW5JbmZvLCBsZXhUeXBlLCBzdHJpY3RN b2RlKTsKICAgICB9CiAKIH0gLy8gbmFtZXNwYWNlIEpTQwo=