45378 2010-09-08 03:47:53 -0700 Remove accessor for private member variable in JSParser 2010-09-09 13:27:55 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 xan.lopez xan.lopez abarth eric webkit.review.bot oldest_to_newest 275725 0 xan.lopez 2010-09-08 03:47:53 -0700 Remove accessor for private member variable in JSParser 275730 1 66869 xan.lopez 2010-09-08 03:51:58 -0700 Created attachment 66869 Patch 276331 2 xan.lopez 2010-09-08 23:45:03 -0700 Committed r67065: <http://trac.webkit.org/changeset/67065> 276704 3 webkit.review.bot 2010-09-09 13:27:55 -0700 http://trac.webkit.org/changeset/67065 might have broken Leopard Intel Debug (Tests) The following changes are on the blame list: http://trac.webkit.org/changeset/67065 http://trac.webkit.org/changeset/67066 66869 2010-09-08 03:51:58 -0700 2010-09-08 23:45:56 -0700 Patch bug-45378-20100908195156.patch text/plain 12882 xan.lopez ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA0Zjk5NDRlOWJiMzUxMmQyMWRmMTMxYTczMjIzODFmZDk5MjNkMDA4Li5k NDZjMmFlZjkyYjRhY2MwMGQ4MWY3NmE2YWI2ZDFmNzdiODFiOGFhIDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTUgQEAKKzIwMTAtMDktMDggIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSBh Y2Nlc3NvciBmb3IgcHJpdmF0ZSBtZW1iZXIgdmFyaWFibGUgaW4gSlNQYXJzZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1Mzc4CisKKyAgICAgICAg bV90b2tlbiBpcyBwcml2YXRlIHRvIEpTUGFyc2VyLCBzbyBpdCBkb2VzIG5vdCBzZWVtIHRvIGJl IHVzZWZ1bAorICAgICAgICB0byBoYXZlIGFuIGFjY2Vzc29yIGZvciBpdC4gT24gdG9wIG9mIHRo YXQsIHRoZSBmaWxlIHdhcyB1c2luZworICAgICAgICBib3RoIHRoZSBhY2Nlc3NvciBhbmQgZGly ZWN0bHkgYWNjZXNzaW5nIHRoZSBtZW1iZXIgdmFyaWFibGUsIG9ubHkKKyAgICAgICAgb25lIHN0 eWxlIHNob3VsZCBiZSB1c2VkLgorCiAyMDEwLTA5LTA4ICBab2x0YW4gSGVyY3plZyAgPHpoZXJj emVnQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYg LS1naXQgYS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvSlNQYXJzZXIuY3BwIGIvSmF2YVNjcmlwdENv cmUvcGFyc2VyL0pTUGFyc2VyLmNwcAppbmRleCA2ODUyZGUxZDE5NWU2MzI4YjM4ZjVjNmJhZWZh YWRkNWZjZDNkZjdiLi44MjA4MTFlNGViMDM2ZmFiNmRiNDc0ZjBiZmE4YzBjNGFhOTk2NTg1IDEw MDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvSlNQYXJzZXIuY3BwCisrKyBiL0phdmFT Y3JpcHRDb3JlL3BhcnNlci9KU1BhcnNlci5jcHAKQEAgLTg1LDExICs4NSwxMCBAQCBwcml2YXRl OgogICAgICAgICBib29sIG1fb2xkQWxsb3dzSW47CiAgICAgfTsKIAotICAgIGNvbnN0IEpTVG9r ZW4mIHRva2VuKCkgeyByZXR1cm4gbV90b2tlbjsgfQogICAgIHZvaWQgbmV4dChMZXhlcjo6TGV4 VHlwZSBsZXhUeXBlID0gTGV4ZXI6OklkZW50aWZ5UmVzZXJ2ZWRXb3JkcykKICAgICB7Ci0gICAg ICAgIG1fbGFzdExpbmUgPSB0b2tlbigpLm1faW5mby5saW5lOwotICAgICAgICBtX2xhc3RUb2tl bkVuZCA9IHRva2VuKCkubV9pbmZvLmVuZE9mZnNldDsKKyAgICAgICAgbV9sYXN0TGluZSA9IG1f dG9rZW4ubV9pbmZvLmxpbmU7CisgICAgICAgIG1fbGFzdFRva2VuRW5kID0gbV90b2tlbi5tX2lu Zm8uZW5kT2Zmc2V0OwogICAgICAgICBtX2xleGVyLT5zZXRMYXN0TGluZU51bWJlcihtX2xhc3RM aW5lKTsKICAgICAgICAgbV90b2tlbi5tX3R5cGUgPSBtX2xleGVyLT5sZXgoJm1fdG9rZW4ubV9k YXRhLCAmbV90b2tlbi5tX2luZm8sIGxleFR5cGUpOwogICAgICAgICBtX3Rva2VuQ291bnQrKzsK QEAgLTExMCwxNyArMTA5LDE3IEBAIHByaXZhdGU6CiAKICAgICBpbnQgdG9rZW5TdGFydCgpCiAg ICAgewotICAgICAgICByZXR1cm4gdG9rZW4oKS5tX2luZm8uc3RhcnRPZmZzZXQ7CisgICAgICAg IHJldHVybiBtX3Rva2VuLm1faW5mby5zdGFydE9mZnNldDsKICAgICB9CiAKICAgICBpbnQgdG9r ZW5MaW5lKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0b2tlbigpLm1faW5mby5saW5lOworICAg ICAgICByZXR1cm4gbV90b2tlbi5tX2luZm8ubGluZTsKICAgICB9CiAKICAgICBpbnQgdG9rZW5F bmQoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRva2VuKCkubV9pbmZvLmVuZE9mZnNldDsKKyAg ICAgICAgcmV0dXJuIG1fdG9rZW4ubV9pbmZvLmVuZE9mZnNldDsKICAgICB9CiAKICAgICB0ZW1w bGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTb3VyY2VFbGVtZW50cyBwYXJzZVNvdXJjZUVs ZW1lbnRzKFRyZWVCdWlsZGVyJik7CkBAIC0xNjgsNyArMTY3LDcgQEAgcHJpdmF0ZToKIAogICAg IGJvb2wgYXV0b1NlbWlDb2xvbigpCiAgICAgewotICAgICAgICBpZiAodG9rZW4oKS5tX3R5cGUg PT0gU0VNSUNPTE9OKSB7CisgICAgICAgIGlmIChtX3Rva2VuLm1fdHlwZSA9PSBTRU1JQ09MT04p IHsKICAgICAgICAgICAgIG5leHQoKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAg ICB9CkBAIC0zMjQsNyArMzIzLDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVl RXhwcmVzc2lvbiBKU1BhcnNlcjo6cGFyc2VWYXJEZWNsYXJhdGlvbkxpc3QoVHIKIAogICAgICAg ICBpbnQgdmFyU3RhcnQgPSB0b2tlblN0YXJ0KCk7CiAgICAgICAgIGlkZW50U3RhcnQgPSB2YXJT dGFydDsKLSAgICAgICAgY29uc3QgSWRlbnRpZmllciogbmFtZSA9IHRva2VuKCkubV9kYXRhLmlk ZW50OworICAgICAgICBjb25zdCBJZGVudGlmaWVyKiBuYW1lID0gbV90b2tlbi5tX2RhdGEuaWRl bnQ7CiAgICAgICAgIGxhc3RJZGVudCA9IG5hbWU7CiAgICAgICAgIG5leHQoKTsKICAgICAgICAg Ym9vbCBoYXNJbml0aWFsaXplciA9IG1hdGNoKEVRVUFMKTsKQEAgLTM1Niw3ICszNTUsNyBAQCB0 ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVDb25zdERlY2xMaXN0IEpTUGFyc2VyOjpw YXJzZUNvbnN0RGVjbGFyYXRpb25MaQogICAgIGRvIHsKICAgICAgICAgbmV4dCgpOwogICAgICAg ICBtYXRjaE9yRmFpbChJREVOVCk7Ci0gICAgICAgIGNvbnN0IElkZW50aWZpZXIqIG5hbWUgPSB0 b2tlbigpLm1fZGF0YS5pZGVudDsKKyAgICAgICAgY29uc3QgSWRlbnRpZmllciogbmFtZSA9IG1f dG9rZW4ubV9kYXRhLmlkZW50OwogICAgICAgICBuZXh0KCk7CiAgICAgICAgIGJvb2wgaGFzSW5p dGlhbGl6ZXIgPSBtYXRjaChFUVVBTCk7CiAgICAgICAgIGNvbnRleHQuYWRkVmFyKG5hbWUsIERl Y2xhcmF0aW9uU3RhY2tzOjpJc0NvbnN0YW50IHwgKGhhc0luaXRpYWxpemVyID8gRGVjbGFyYXRp b25TdGFja3M6Okhhc0luaXRpYWxpemVyIDogMCkpOwpAQCAtNDgyLDcgKzQ4MSw3IEBAIHRlbXBs YXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZVN0YXRlbWVudCBKU1BhcnNlcjo6cGFyc2VCcmVh a1N0YXRlbWVudChUcmVlQnVpCiAgICAgaWYgKGF1dG9TZW1pQ29sb24oKSkKICAgICAgICAgcmV0 dXJuIGNvbnRleHQuY3JlYXRlQnJlYWtTdGF0ZW1lbnQoc3RhcnRDb2wsIGVuZENvbCwgc3RhcnRM aW5lLCBlbmRMaW5lKTsKICAgICBtYXRjaE9yRmFpbChJREVOVCk7Ci0gICAgY29uc3QgSWRlbnRp ZmllciogaWRlbnQgPSB0b2tlbigpLm1fZGF0YS5pZGVudDsKKyAgICBjb25zdCBJZGVudGlmaWVy KiBpZGVudCA9IG1fdG9rZW4ubV9kYXRhLmlkZW50OwogICAgIGVuZENvbCA9IHRva2VuRW5kKCk7 CiAgICAgZW5kTGluZSA9IHRva2VuTGluZSgpOwogICAgIG5leHQoKTsKQEAgLTUwMiw3ICs1MDEs NyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQgSlNQYXJzZXI6 OnBhcnNlQ29udGludWVTdGF0ZW1lbnQoVHJlZQogICAgIGlmIChhdXRvU2VtaUNvbG9uKCkpCiAg ICAgICAgIHJldHVybiBjb250ZXh0LmNyZWF0ZUNvbnRpbnVlU3RhdGVtZW50KHN0YXJ0Q29sLCBl bmRDb2wsIHN0YXJ0TGluZSwgZW5kTGluZSk7CiAgICAgbWF0Y2hPckZhaWwoSURFTlQpOwotICAg IGNvbnN0IElkZW50aWZpZXIqIGlkZW50ID0gdG9rZW4oKS5tX2RhdGEuaWRlbnQ7CisgICAgY29u c3QgSWRlbnRpZmllciogaWRlbnQgPSBtX3Rva2VuLm1fZGF0YS5pZGVudDsKICAgICBlbmRDb2wg PSB0b2tlbkVuZCgpOwogICAgIGVuZExpbmUgPSB0b2tlbkxpbmUoKTsKICAgICBuZXh0KCk7CkBA IC02NTQsNyArNjUzLDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVt ZW50IEpTUGFyc2VyOjpwYXJzZVRyeVN0YXRlbWVudChUcmVlQnVpbGQKICAgICAgICAgbmV4dCgp OwogICAgICAgICBjb25zdW1lT3JGYWlsKE9QRU5QQVJFTik7CiAgICAgICAgIG1hdGNoT3JGYWls KElERU5UKTsKLSAgICAgICAgaWRlbnQgPSB0b2tlbigpLm1fZGF0YS5pZGVudDsKKyAgICAgICAg aWRlbnQgPSBtX3Rva2VuLm1fZGF0YS5pZGVudDsKICAgICAgICAgbmV4dCgpOwogICAgICAgICBj b25zdW1lT3JGYWlsKENMT1NFUEFSRU4pOwogICAgICAgICBtYXRjaE9yRmFpbChPUEVOQlJBQ0Up OwpAQCAtNzA1LDcgKzcwNCw3IEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZVN0 YXRlbWVudCBKU1BhcnNlcjo6cGFyc2VCbG9ja1N0YXRlbWVudChUcmVlQnVpCiB0ZW1wbGF0ZSA8 Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVTdGF0ZW1lbnQgSlNQYXJzZXI6OnBhcnNlU3RhdGVtZW50 KFRyZWVCdWlsZGVyJiBjb250ZXh0KQogewogICAgIGZhaWxJZlN0YWNrT3ZlcmZsb3coKTsKLSAg ICBzd2l0Y2ggKHRva2VuKCkubV90eXBlKSB7CisgICAgc3dpdGNoIChtX3Rva2VuLm1fdHlwZSkg ewogICAgIGNhc2UgT1BFTkJSQUNFOgogICAgICAgICByZXR1cm4gcGFyc2VCbG9ja1N0YXRlbWVu dChjb250ZXh0KTsKICAgICBjYXNlIFZBUjoKQEAgLTc1NywxNCArNzU2LDE0IEBAIHRlbXBsYXRl IDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZVN0YXRlbWVudCBKU1BhcnNlcjo6cGFyc2VTdGF0ZW1l bnQoVHJlZUJ1aWxkZXImCiB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVGb3JtYWxQ YXJhbWV0ZXJMaXN0IEpTUGFyc2VyOjpwYXJzZUZvcm1hbFBhcmFtZXRlcnMoVHJlZUJ1aWxkZXIm IGNvbnRleHQsIGJvb2wmIHVzZXNBcmd1bWVudHMpCiB7CiAgICAgbWF0Y2hPckZhaWwoSURFTlQp OwotICAgIHVzZXNBcmd1bWVudHMgPSBtX2dsb2JhbERhdGEtPnByb3BlcnR5TmFtZXMtPmFyZ3Vt ZW50cyA9PSAqdG9rZW4oKS5tX2RhdGEuaWRlbnQ7Ci0gICAgVHJlZUZvcm1hbFBhcmFtZXRlckxp c3QgbGlzdCA9IGNvbnRleHQuY3JlYXRlRm9ybWFsUGFyYW1ldGVyTGlzdCgqdG9rZW4oKS5tX2Rh dGEuaWRlbnQpOworICAgIHVzZXNBcmd1bWVudHMgPSBtX2dsb2JhbERhdGEtPnByb3BlcnR5TmFt ZXMtPmFyZ3VtZW50cyA9PSAqbV90b2tlbi5tX2RhdGEuaWRlbnQ7CisgICAgVHJlZUZvcm1hbFBh cmFtZXRlckxpc3QgbGlzdCA9IGNvbnRleHQuY3JlYXRlRm9ybWFsUGFyYW1ldGVyTGlzdCgqbV90 b2tlbi5tX2RhdGEuaWRlbnQpOwogICAgIFRyZWVGb3JtYWxQYXJhbWV0ZXJMaXN0IHRhaWwgPSBs aXN0OwogICAgIG5leHQoKTsKICAgICB3aGlsZSAobWF0Y2goQ09NTUEpKSB7CiAgICAgICAgIG5l eHQoKTsKICAgICAgICAgbWF0Y2hPckZhaWwoSURFTlQpOwotICAgICAgICBjb25zdCBJZGVudGlm aWVyKiBpZGVudCA9IHRva2VuKCkubV9kYXRhLmlkZW50OworICAgICAgICBjb25zdCBJZGVudGlm aWVyKiBpZGVudCA9IG1fdG9rZW4ubV9kYXRhLmlkZW50OwogICAgICAgICBuZXh0KCk7CiAgICAg ICAgIHVzZXNBcmd1bWVudHMgPSB1c2VzQXJndW1lbnRzIHx8IG1fZ2xvYmFsRGF0YS0+cHJvcGVy dHlOYW1lcy0+YXJndW1lbnRzID09ICppZGVudDsKICAgICAgICAgdGFpbCA9IGNvbnRleHQuY3Jl YXRlRm9ybWFsUGFyYW1ldGVyTGlzdCh0YWlsLCAqaWRlbnQpOwpAQCAtNzg0LDcgKzc4Myw3IEBA IHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4gVHJlZUZ1bmN0aW9uQm9keSBKU1BhcnNlcjo6 cGFyc2VGdW5jdGlvbkJvZHkoVHJlZUJ1CiB0ZW1wbGF0ZSA8SlNQYXJzZXI6OkZ1bmN0aW9uUmVx dWlyZW1lbnRzIHJlcXVpcmVtZW50cywgY2xhc3MgVHJlZUJ1aWxkZXI+IGJvb2wgSlNQYXJzZXI6 OnBhcnNlRnVuY3Rpb25JbmZvKFRyZWVCdWlsZGVyJiBjb250ZXh0LCBjb25zdCBJZGVudGlmaWVy KiYgbmFtZSwgVHJlZUZvcm1hbFBhcmFtZXRlckxpc3QmIHBhcmFtZXRlcnMsIFRyZWVGdW5jdGlv bkJvZHkmIGJvZHksIGludCYgb3BlbkJyYWNlUG9zLCBpbnQmIGNsb3NlQnJhY2VQb3MsIGludCYg Ym9keVN0YXJ0TGluZSkKIHsKICAgICBpZiAobWF0Y2goSURFTlQpKSB7Ci0gICAgICAgIG5hbWUg PSB0b2tlbigpLm1fZGF0YS5pZGVudDsKKyAgICAgICAgbmFtZSA9IG1fdG9rZW4ubV9kYXRhLmlk ZW50OwogICAgICAgICBuZXh0KCk7CiAgICAgfSBlbHNlIGlmIChyZXF1aXJlbWVudHMgPT0gRnVu Y3Rpb25OZWVkc05hbWUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTc5Nyw3ICs3OTYsNyBA QCB0ZW1wbGF0ZSA8SlNQYXJzZXI6OkZ1bmN0aW9uUmVxdWlyZW1lbnRzIHJlcXVpcmVtZW50cywg Y2xhc3MgVHJlZUJ1aWxkZXI+IGJvb2wgSgogICAgIGNvbnN1bWVPckZhaWwoQ0xPU0VQQVJFTik7 CiAgICAgbWF0Y2hPckZhaWwoT1BFTkJSQUNFKTsKIAotICAgIG9wZW5CcmFjZVBvcyA9IHRva2Vu KCkubV9kYXRhLmludFZhbHVlOworICAgIG9wZW5CcmFjZVBvcyA9IG1fdG9rZW4ubV9kYXRhLmlu dFZhbHVlOwogICAgIGJvZHlTdGFydExpbmUgPSB0b2tlbkxpbmUoKTsKICAgICBuZXh0KCk7CiAK QEAgLTgwNyw3ICs4MDYsNyBAQCB0ZW1wbGF0ZSA8SlNQYXJzZXI6OkZ1bmN0aW9uUmVxdWlyZW1l bnRzIHJlcXVpcmVtZW50cywgY2xhc3MgVHJlZUJ1aWxkZXI+IGJvb2wgSgogICAgICAgICBjb250 ZXh0LnNldFVzZXNBcmd1bWVudHMoYm9keSk7CiAKICAgICBtYXRjaE9yRmFpbChDTE9TRUJSQUNF KTsKLSAgICBjbG9zZUJyYWNlUG9zID0gdG9rZW4oKS5tX2RhdGEuaW50VmFsdWU7CisgICAgY2xv c2VCcmFjZVBvcyA9IG1fdG9rZW4ubV9kYXRhLmludFZhbHVlOwogICAgIG5leHQoKTsKICAgICBy ZXR1cm4gdHJ1ZTsKIH0KQEAgLTgzNyw3ICs4MzYsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1 aWxkZXI+IFRyZWVTdGF0ZW1lbnQgSlNQYXJzZXI6OnBhcnNlRXhwcmVzc2lvbk9yTGFiZWxTdGF0 ZQogICAgICAqLwogICAgIGludCBzdGFydCA9IHRva2VuU3RhcnQoKTsKICAgICBpbnQgc3RhcnRM aW5lID0gdG9rZW5MaW5lKCk7Ci0gICAgY29uc3QgSWRlbnRpZmllciogaWRlbnQgPSB0b2tlbigp Lm1fZGF0YS5pZGVudDsKKyAgICBjb25zdCBJZGVudGlmaWVyKiBpZGVudCA9IG1fdG9rZW4ubV9k YXRhLmlkZW50OwogICAgIGludCBjdXJyZW50VG9rZW4gPSBtX3Rva2VuQ291bnQ7CiAgICAgVHJl ZUV4cHJlc3Npb24gZXhwcmVzc2lvbiA9IHBhcnNlRXhwcmVzc2lvbihjb250ZXh0KTsKICAgICBm YWlsSWZGYWxzZShleHByZXNzaW9uKTsKQEAgLTk3Miw3ICs5NzEsNyBAQCB0ZW1wbGF0ZSA8dHlw ZW5hbWUgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNzaW9uIEpTUGFyc2VyOjpwYXJzZUFzc2lnbm1l bnRFeHByZXNzaQogICAgIE9wZXJhdG9yIG9wOwogICAgIGJvb2wgaGFkQXNzaWdubWVudCA9IGZh bHNlOwogICAgIHdoaWxlICh0cnVlKSB7Ci0gICAgICAgIHN3aXRjaCAodG9rZW4oKS5tX3R5cGUp IHsKKyAgICAgICAgc3dpdGNoIChtX3Rva2VuLm1fdHlwZSkgewogICAgICAgICBjYXNlIEVRVUFM OiBvcCA9IE9wRXF1YWw7IGJyZWFrOwogICAgICAgICBjYXNlIFBMVVNFUVVBTDogb3AgPSBPcFBs dXNFcTsgYnJlYWs7CiAgICAgICAgIGNhc2UgTUlOVVNFUVVBTDogb3AgPSBPcE1pbnVzRXE7IGJy ZWFrOwpAQCAtMTA1MSwxMSArMTA1MCwxMSBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+ IFRyZWVFeHByZXNzaW9uIEpTUGFyc2VyOjpwYXJzZUJpbmFyeUV4cHJlc3Npb24oVHJlZQogICAg ICAgICBmYWlsSWZGYWxzZShjdXJyZW50KTsKIAogICAgICAgICBjb250ZXh0LmFwcGVuZEJpbmFy eUV4cHJlc3Npb25JbmZvKG9wZXJhbmRTdGFja0RlcHRoLCBjdXJyZW50LCBleHByU3RhcnQsIGxh c3RUb2tlbkVuZCgpLCBsYXN0VG9rZW5FbmQoKSwgaW5pdGlhbEFzc2lnbm1lbnRzICE9IG1fYXNz aWdubWVudENvdW50KTsKLSAgICAgICAgaW50IHByZWNlZGVuY2UgPSBpc0JpbmFyeU9wZXJhdG9y KHRva2VuKCkubV90eXBlKTsKKyAgICAgICAgaW50IHByZWNlZGVuY2UgPSBpc0JpbmFyeU9wZXJh dG9yKG1fdG9rZW4ubV90eXBlKTsKICAgICAgICAgaWYgKCFwcmVjZWRlbmNlKQogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIG1fbm9uTEhTQ291bnQrKzsKLSAgICAgICAgaW50IG9wZXJhdG9y VG9rZW4gPSB0b2tlbigpLm1fdHlwZTsKKyAgICAgICAgaW50IG9wZXJhdG9yVG9rZW4gPSBtX3Rv a2VuLm1fdHlwZTsKICAgICAgICAgbmV4dCgpOwogCiAgICAgICAgIHdoaWxlIChvcGVyYXRvclN0 YWNrRGVwdGggJiYgIGNvbnRleHQub3BlcmF0b3JTdGFja0hhc0hpZ2hlclByZWNlZGVuY2Uob3Bl cmF0b3JTdGFja0RlcHRoLCBwcmVjZWRlbmNlKSkgewpAQCAtMTA4NiwxMiArMTA4NSwxMiBAQCB0 ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNzaW9uIEpTUGFyc2VyOjpwYXJz ZUJpbmFyeUV4cHJlc3Npb24oVHJlZQogdGVtcGxhdGUgPGJvb2wgY29tcGxldGUsIGNsYXNzIFRy ZWVCdWlsZGVyPiBUcmVlUHJvcGVydHkgSlNQYXJzZXI6OnBhcnNlUHJvcGVydHkoVHJlZUJ1aWxk ZXImIGNvbnRleHQpCiB7CiAgICAgYm9vbCB3YXNJZGVudCA9IGZhbHNlOwotICAgIHN3aXRjaCAo dG9rZW4oKS5tX3R5cGUpIHsKKyAgICBzd2l0Y2ggKG1fdG9rZW4ubV90eXBlKSB7CiAgICAgbmFt ZWRQcm9wZXJ0eToKICAgICBjYXNlIElERU5UOgogICAgICAgICB3YXNJZGVudCA9IHRydWU7CiAg ICAgY2FzZSBTVFJJTkc6IHsKLSAgICAgICAgY29uc3QgSWRlbnRpZmllciogaWRlbnQgPSB0b2tl bigpLm1fZGF0YS5pZGVudDsKKyAgICAgICAgY29uc3QgSWRlbnRpZmllciogaWRlbnQgPSBtX3Rv a2VuLm1fZGF0YS5pZGVudDsKICAgICAgICAgbmV4dChMZXhlcjo6SWdub3JlUmVzZXJ2ZWRXb3Jk cyk7CiAgICAgICAgIGlmIChtYXRjaChDT0xPTikpIHsKICAgICAgICAgICAgIG5leHQoKTsKQEAg LTExMTgsNyArMTExNyw3IEBAIHRlbXBsYXRlIDxib29sIGNvbXBsZXRlLCBjbGFzcyBUcmVlQnVp bGRlcj4gVHJlZVByb3BlcnR5IEpTUGFyc2VyOjpwYXJzZVByb3BlcnR5CiAgICAgICAgIHJldHVy biBjb250ZXh0LnRlbXBsYXRlIGNyZWF0ZUdldHRlck9yU2V0dGVyUHJvcGVydHk8Y29tcGxldGU+ KHR5cGUsIGFjY2Vzc29yTmFtZSwgcGFyYW1ldGVycywgYm9keSwgb3BlbkJyYWNlUG9zLCBjbG9z ZUJyYWNlUG9zLCBib2R5U3RhcnRMaW5lLCBtX2xhc3RMaW5lKTsKICAgICB9CiAgICAgY2FzZSBO VU1CRVI6IHsKLSAgICAgICAgZG91YmxlIHByb3BlcnR5TmFtZSA9IHRva2VuKCkubV9kYXRhLmRv dWJsZVZhbHVlOworICAgICAgICBkb3VibGUgcHJvcGVydHlOYW1lID0gbV90b2tlbi5tX2RhdGEu ZG91YmxlVmFsdWU7CiAgICAgICAgIG5leHQoKTsKICAgICAgICAgY29uc3VtZU9yRmFpbChDT0xP Tik7CiAgICAgICAgIFRyZWVFeHByZXNzaW9uIG5vZGUgPSBwYXJzZUFzc2lnbm1lbnRFeHByZXNz aW9uKGNvbnRleHQpOwpAQCAtMTEyNiwxNCArMTEyNSwxNCBAQCB0ZW1wbGF0ZSA8Ym9vbCBjb21w bGV0ZSwgY2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVQcm9wZXJ0eSBKU1BhcnNlcjo6cGFyc2VQcm9w ZXJ0eQogICAgICAgICByZXR1cm4gY29udGV4dC50ZW1wbGF0ZSBjcmVhdGVQcm9wZXJ0eTxjb21w bGV0ZT4obV9nbG9iYWxEYXRhLCBwcm9wZXJ0eU5hbWUsIG5vZGUsIFByb3BlcnR5Tm9kZTo6Q29u c3RhbnQpOwogICAgIH0KICAgICBkZWZhdWx0OgotICAgICAgICBmYWlsSWZGYWxzZSh0b2tlbigp Lm1fdHlwZSAmIEtleXdvcmRUb2tlbkZsYWcpOworICAgICAgICBmYWlsSWZGYWxzZShtX3Rva2Vu Lm1fdHlwZSAmIEtleXdvcmRUb2tlbkZsYWcpOwogICAgICAgICBnb3RvIG5hbWVkUHJvcGVydHk7 CiAgICAgfQogfQogCiB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNzaW9u IEpTUGFyc2VyOjpwYXJzZU9iamVjdExpdGVyYWwoVHJlZUJ1aWxkZXImIGNvbnRleHQpCiB7Ci0g ICAgaW50IHN0YXJ0T2Zmc2V0ID0gdG9rZW4oKS5tX2RhdGEuaW50VmFsdWU7CisgICAgaW50IHN0 YXJ0T2Zmc2V0ID0gbV90b2tlbi5tX2RhdGEuaW50VmFsdWU7CiAgICAgY29uc3VtZU9yRmFpbChP UEVOQlJBQ0UpOwogCiAgICAgaWYgKG1hdGNoKENMT1NFQlJBQ0UpKSB7CkBAIC0xMjYwLDcgKzEy NTksNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNzaW9uIEpTUGFy c2VyOjpwYXJzZUFycmF5TGl0ZXJhbChUcmVlQnVpbAogCiB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1 aWxkZXI+IFRyZWVFeHByZXNzaW9uIEpTUGFyc2VyOjpwYXJzZVByaW1hcnlFeHByZXNzaW9uKFRy ZWVCdWlsZGVyJiBjb250ZXh0KQogewotICAgIHN3aXRjaCAodG9rZW4oKS5tX3R5cGUpIHsKKyAg ICBzd2l0Y2ggKG1fdG9rZW4ubV90eXBlKSB7CiAgICAgY2FzZSBPUEVOQlJBQ0U6CiAgICAgICAg IHJldHVybiBwYXJzZU9iamVjdExpdGVyYWwoY29udGV4dCk7CiAgICAgY2FzZSBPUEVOQlJBQ0tF VDoKQEAgLTEyODAsMTcgKzEyNzksMTcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBU cmVlRXhwcmVzc2lvbiBKU1BhcnNlcjo6cGFyc2VQcmltYXJ5RXhwcmVzc2lvbihUcmUKICAgICB9 CiAgICAgY2FzZSBJREVOVDogewogICAgICAgICBpbnQgc3RhcnQgPSB0b2tlblN0YXJ0KCk7Ci0g ICAgICAgIGNvbnN0IElkZW50aWZpZXIqIGlkZW50ID0gdG9rZW4oKS5tX2RhdGEuaWRlbnQ7Cisg ICAgICAgIGNvbnN0IElkZW50aWZpZXIqIGlkZW50ID0gbV90b2tlbi5tX2RhdGEuaWRlbnQ7CiAg ICAgICAgIG5leHQoKTsKICAgICAgICAgcmV0dXJuIGNvbnRleHQuY3JlYXRlUmVzb2x2ZShpZGVu dCwgc3RhcnQpOwogICAgIH0KICAgICBjYXNlIFNUUklORzogewotICAgICAgICBjb25zdCBJZGVu dGlmaWVyKiBpZGVudCA9IHRva2VuKCkubV9kYXRhLmlkZW50OworICAgICAgICBjb25zdCBJZGVu dGlmaWVyKiBpZGVudCA9IG1fdG9rZW4ubV9kYXRhLmlkZW50OwogICAgICAgICBuZXh0KCk7CiAg ICAgICAgIHJldHVybiBjb250ZXh0LmNyZWF0ZVN0cmluZyhpZGVudCk7CiAgICAgfQogICAgIGNh c2UgTlVNQkVSOiB7Ci0gICAgICAgIGRvdWJsZSBkID0gdG9rZW4oKS5tX2RhdGEuZG91YmxlVmFs dWU7CisgICAgICAgIGRvdWJsZSBkID0gbV90b2tlbi5tX2RhdGEuZG91YmxlVmFsdWU7CiAgICAg ICAgIG5leHQoKTsKICAgICAgICAgcmV0dXJuIGNvbnRleHQuY3JlYXRlTnVtYmVyRXhwcihkKTsK ICAgICB9CkBAIC0xMzcyLDcgKzEzNzEsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+ IFRyZWVFeHByZXNzaW9uIEpTUGFyc2VyOjpwYXJzZU1lbWJlckV4cHJlc3Npb24oVHJlZQogCiAg ICAgZmFpbElmRmFsc2UoYmFzZSk7CiAgICAgd2hpbGUgKHRydWUpIHsKLSAgICAgICAgc3dpdGNo ICh0b2tlbigpLm1fdHlwZSkgeworICAgICAgICBzd2l0Y2ggKG1fdG9rZW4ubV90eXBlKSB7CiAg ICAgICAgIGNhc2UgT1BFTkJSQUNLRVQ6IHsKICAgICAgICAgICAgIGludCBleHByZXNzaW9uRW5k ID0gbGFzdFRva2VuRW5kKCk7CiAgICAgICAgICAgICBuZXh0KCk7CkBAIC0xNDEwLDcgKzE0MDks NyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNzaW9uIEpTUGFyc2Vy OjpwYXJzZU1lbWJlckV4cHJlc3Npb24oVHJlZQogICAgICAgICAgICAgaW50IGV4cHJlc3Npb25F bmQgPSBsYXN0VG9rZW5FbmQoKTsKICAgICAgICAgICAgIG5leHQoTGV4ZXI6Oklnbm9yZVJlc2Vy dmVkV29yZHMpOwogICAgICAgICAgICAgbWF0Y2hPckZhaWwoSURFTlQpOwotICAgICAgICAgICAg YmFzZSA9IGNvbnRleHQuY3JlYXRlRG90QWNjZXNzKGJhc2UsICp0b2tlbigpLm1fZGF0YS5pZGVu dCwgZXhwcmVzc2lvblN0YXJ0LCBleHByZXNzaW9uRW5kLCB0b2tlbkVuZCgpKTsKKyAgICAgICAg ICAgIGJhc2UgPSBjb250ZXh0LmNyZWF0ZURvdEFjY2VzcyhiYXNlLCAqbV90b2tlbi5tX2RhdGEu aWRlbnQsIGV4cHJlc3Npb25TdGFydCwgZXhwcmVzc2lvbkVuZCwgdG9rZW5FbmQoKSk7CiAgICAg ICAgICAgICBuZXh0KCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQpAQCAtMTQyOCwx NSArMTQyNywxNSBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNzaW9u IEpTUGFyc2VyOjpwYXJzZVVuYXJ5RXhwcmVzc2lvbihUcmVlQgogewogICAgIEFsbG93SW5PdmVy cmlkZSBhbGxvd0luT3ZlcnJpZGUodGhpcyk7CiAgICAgaW50IHRva2VuU3RhY2tEZXB0aCA9IDA7 Ci0gICAgd2hpbGUgKGlzVW5hcnlPcCh0b2tlbigpLm1fdHlwZSkpIHsKKyAgICB3aGlsZSAoaXNV bmFyeU9wKG1fdG9rZW4ubV90eXBlKSkgewogICAgICAgICBtX25vbkxIU0NvdW50Kys7Ci0gICAg ICAgIGNvbnRleHQuYXBwZW5kVW5hcnlUb2tlbih0b2tlblN0YWNrRGVwdGgsIHRva2VuKCkubV90 eXBlLCB0b2tlblN0YXJ0KCkpOworICAgICAgICBjb250ZXh0LmFwcGVuZFVuYXJ5VG9rZW4odG9r ZW5TdGFja0RlcHRoLCBtX3Rva2VuLm1fdHlwZSwgdG9rZW5TdGFydCgpKTsKICAgICAgICAgbmV4 dCgpOwogICAgIH0KICAgICBpbnQgc3ViRXhwclN0YXJ0ID0gdG9rZW5TdGFydCgpOwogICAgIFRy ZWVFeHByZXNzaW9uIGV4cHIgPSBwYXJzZU1lbWJlckV4cHJlc3Npb24oY29udGV4dCk7CiAgICAg ZmFpbElmRmFsc2UoZXhwcik7Ci0gICAgc3dpdGNoICh0b2tlbigpLm1fdHlwZSkgeworICAgIHN3 aXRjaCAobV90b2tlbi5tX3R5cGUpIHsKICAgICBjYXNlIFBMVVNQTFVTOgogICAgICAgICBtX25v bkxIU0NvdW50Kys7CiAgICAgICAgIGV4cHIgPSBjb250ZXh0Lm1ha2VQb3N0Zml4Tm9kZShleHBy LCBPcFBsdXNQbHVzLCBzdWJFeHByU3RhcnQsIGxhc3RUb2tlbkVuZCgpLCB0b2tlbkVuZCgpKTsK