102749 2012-11-19 17:36:00 -0800 In CodeGeneratorObj.pm we should rename $dataNode to $interface. 2012-11-19 20:30:22 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth gtk-ews japhet webkit.review.bot xan.lopez oldest_to_newest 771275 0 haraken 2012-11-19 17:36:00 -0800 $dataNode is misnamed. It should be renamed to $interface. I'll upload a patch per build system because I couldn't check the build locally. 771279 1 175095 haraken 2012-11-19 17:36:51 -0800 Created attachment 175095 Patch 771317 2 175095 gtk-ews 2012-11-19 17:56:07 -0800 Comment on attachment 175095 Patch Attachment 175095 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/14907422 771439 3 haraken 2012-11-19 20:30:22 -0800 Committed r135240: <http://trac.webkit.org/changeset/135240> 175095 2012-11-19 17:36:51 -0800 2012-11-19 17:56:07 -0800 Patch bug-102749-20121120103441.patch text/plain 10059 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1MjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWY1NjgwMDcyZjhhZTE4 NjYwZWJkMTlhNjg1OTlkNjNjMzNlM2M2Zi4uNGExYjVkYzY5Zjg3ODM5NDJlZDE2NmUxMzNkNzVj MWM1M2FhMGNiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTE5ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBJbiBDb2RlR2VuZXJh dG9yT2JqLnBtIHdlIHNob3VsZCByZW5hbWUgJGRhdGFOb2RlIHRvICRpbnRlcmZhY2UuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDI3NDkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAkZGF0YU5vZGUgaXMg bWlzbmFtZWQuIEl0IHNob3VsZCBiZSByZW5hbWVkIHRvICRpbnRlcmZhY2UuCisKKyAgICAgICAg Tm8gdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIGJpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvck9iakMucG06CisgICAgICAgIChHZW5lcmF0ZUludGVyZmFjZSk6 CisgICAgICAgIChHZXRQYXJlbnRJbXBsQ2xhc3NOYW1lKToKKyAgICAgICAgKEdldFBhcmVudEFu ZFByb3RvY29scyk6CisgICAgICAgIChHZW5lcmF0ZUhlYWRlcik6CisgICAgICAgIChHZW5lcmF0 ZUltcGxlbWVudGF0aW9uKToKKwogMjAxMi0xMS0xOSAgQWxwaGEgTGFtICA8aGNsYW1AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4gQnVpbGQgZml4IGZvciBDaHJvbWl1bS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv ck9iakMucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JP YmpDLnBtCmluZGV4IGEwY2Q4NTI4ZDZlNzZiY2E3ODg0MDJmOWQ5YzEzODFmMTA5NzM3MGYuLjZi Mjg0ZTdmNDJkMGFhYmJkNTA3NWFlNzdlZWM4ODYwOWVhNmQ1YmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvck9iakMucG0KKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yT2JqQy5wbQpAQCAtMjY5 LDIyICsyNjksMjIgQEAgc3ViIFJlYWRQdWJsaWNJbnRlcmZhY2VzCiBzdWIgR2VuZXJhdGVJbnRl cmZhY2UKIHsKICAgICBteSAkb2JqZWN0ID0gc2hpZnQ7Ci0gICAgbXkgJGRhdGFOb2RlID0gc2hp ZnQ7CisgICAgbXkgJGludGVyZmFjZSA9IHNoaWZ0OwogICAgIG15ICRkZWZpbmVzID0gc2hpZnQ7 CiAKICAgICAkZmF0YWxFcnJvciA9IDA7CiAKLSAgICBteSAkbmFtZSA9ICRkYXRhTm9kZS0+bmFt ZTsKKyAgICBteSAkbmFtZSA9ICRpbnRlcmZhY2UtPm5hbWU7CiAgICAgbXkgJGNsYXNzTmFtZSA9 IEdldENsYXNzTmFtZSgkbmFtZSk7Ci0gICAgbXkgJHBhcmVudENsYXNzTmFtZSA9ICJET00iIC4g R2V0UGFyZW50SW1wbENsYXNzTmFtZSgkZGF0YU5vZGUpOwotICAgICRpc1Byb3RvY29sID0gJGRh dGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPntPYmpDUHJvdG9jb2x9OwotICAgICRub0ltcGwg PSAkZGF0YU5vZGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+e09iakNDdXN0b21JbXBsZW1lbnRhdGlv bn0gfHwgJGlzUHJvdG9jb2w7CisgICAgbXkgJHBhcmVudENsYXNzTmFtZSA9ICJET00iIC4gR2V0 UGFyZW50SW1wbENsYXNzTmFtZSgkaW50ZXJmYWNlKTsKKyAgICAkaXNQcm90b2NvbCA9ICRpbnRl cmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+e09iakNQcm90b2NvbH07CisgICAgJG5vSW1wbCA9 ICRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+e09iakNDdXN0b21JbXBsZW1lbnRhdGlv bn0gfHwgJGlzUHJvdG9jb2w7CiAKICAgICBSZWFkUHVibGljSW50ZXJmYWNlcygkY2xhc3NOYW1l LCAkcGFyZW50Q2xhc3NOYW1lLCAkZGVmaW5lcywgJGlzUHJvdG9jb2wpOwogCiAgICAgIyBTdGFy dCBhY3R1YWwgZ2VuZXJhdGlvbi4uCi0gICAgJG9iamVjdC0+R2VuZXJhdGVIZWFkZXIoJGRhdGFO b2RlKTsKLSAgICAkb2JqZWN0LT5HZW5lcmF0ZUltcGxlbWVudGF0aW9uKCRkYXRhTm9kZSkgdW5s ZXNzICRub0ltcGw7CisgICAgJG9iamVjdC0+R2VuZXJhdGVIZWFkZXIoJGludGVyZmFjZSk7Cisg ICAgJG9iamVjdC0+R2VuZXJhdGVJbXBsZW1lbnRhdGlvbigkaW50ZXJmYWNlKSB1bmxlc3MgJG5v SW1wbDsKIAogICAgICMgV3JpdGUgY2hhbmdlcy4KICAgICAkb2JqZWN0LT5Xcml0ZURhdGEoRmls ZU5hbWVQcmVmaXggLiAkbmFtZSk7CkBAIC0zMzcsMTEgKzMzNywxMSBAQCBzdWIgR2V0SW1wbENs YXNzTmFtZQogCiBzdWIgR2V0UGFyZW50SW1wbENsYXNzTmFtZQogewotICAgIG15ICRkYXRhTm9k ZSA9IHNoaWZ0OworICAgIG15ICRpbnRlcmZhY2UgPSBzaGlmdDsKIAotICAgIHJldHVybiAiT2Jq ZWN0IiBpZiBAeyRkYXRhTm9kZS0+cGFyZW50c30gZXEgMDsKKyAgICByZXR1cm4gIk9iamVjdCIg aWYgQHskaW50ZXJmYWNlLT5wYXJlbnRzfSBlcSAwOwogCi0gICAgbXkgJHBhcmVudCA9ICRkYXRh Tm9kZS0+cGFyZW50cygwKTsKKyAgICBteSAkcGFyZW50ID0gJGludGVyZmFjZS0+cGFyZW50cygw KTsKIAogICAgICMgc3BlY2lhbCBjYXNlcwogICAgIHJldHVybiAiT2JqZWN0IiBpZiAkcGFyZW50 IGVxICJIVE1MQ29sbGVjdGlvbiI7CkBAIC0zNTEsMjAgKzM1MSwyMCBAQCBzdWIgR2V0UGFyZW50 SW1wbENsYXNzTmFtZQogCiBzdWIgR2V0UGFyZW50QW5kUHJvdG9jb2xzCiB7Ci0gICAgbXkgJGRh dGFOb2RlID0gc2hpZnQ7Ci0gICAgbXkgJG51bVBhcmVudHMgPSBAeyRkYXRhTm9kZS0+cGFyZW50 c307CisgICAgbXkgJGludGVyZmFjZSA9IHNoaWZ0OworICAgIG15ICRudW1QYXJlbnRzID0gQHsk aW50ZXJmYWNlLT5wYXJlbnRzfTsKIAogICAgIG15ICRwYXJlbnQgPSAiIjsKICAgICBteSBAcHJv dG9jb2xzID0gKCk7CiAgICAgaWYgKCRudW1QYXJlbnRzIGVxIDApIHsKICAgICAgICAgaWYgKCRp c1Byb3RvY29sKSB7CiAgICAgICAgICAgICBwdXNoKEBwcm90b2NvbHMsICJOU09iamVjdCIpOwot ICAgICAgICAgICAgcHVzaChAcHJvdG9jb2xzLCAiTlNDb3B5aW5nIikgaWYgJGRhdGFOb2RlLT5u YW1lIGVxICJFdmVudFRhcmdldCI7CisgICAgICAgICAgICBwdXNoKEBwcm90b2NvbHMsICJOU0Nv cHlpbmciKSBpZiAkaW50ZXJmYWNlLT5uYW1lIGVxICJFdmVudFRhcmdldCI7CiAgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICAkcGFyZW50ID0gIkRPTU9iamVjdCI7CiAgICAgICAgIH0KICAg ICB9IGVsc2lmICgkbnVtUGFyZW50cyBlcSAxKSB7Ci0gICAgICAgIG15ICRwYXJlbnROYW1lID0g JGRhdGFOb2RlLT5wYXJlbnRzKDApOworICAgICAgICBteSAkcGFyZW50TmFtZSA9ICRpbnRlcmZh Y2UtPnBhcmVudHMoMCk7CiAgICAgICAgIGlmICgkaXNQcm90b2NvbCkgewogICAgICAgICAgICAg ZGllICJQYXJlbnRzIG9mIHByb3RvY29scyBtdXN0IGFsc28gYmUgcHJvdG9jb2xzLiIgdW5sZXNz IElzUHJvdG9jb2xUeXBlKCRwYXJlbnROYW1lKTsKICAgICAgICAgICAgIHB1c2goQHByb3RvY29s cywgIkRPTSIgLiAkcGFyZW50TmFtZSk7CkBAIC0zNzgsNyArMzc4LDcgQEAgc3ViIEdldFBhcmVu dEFuZFByb3RvY29scwogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfSBlbHNlIHsKLSAg ICAgICAgbXkgQHBhcmVudHMgPSBAeyRkYXRhTm9kZS0+cGFyZW50c307CisgICAgICAgIG15IEBw YXJlbnRzID0gQHskaW50ZXJmYWNlLT5wYXJlbnRzfTsKICAgICAgICAgbXkgJGZpcnN0UGFyZW50 ID0gc2hpZnQoQHBhcmVudHMpOwogICAgICAgICBpZiAoSXNQcm90b2NvbFR5cGUoJGZpcnN0UGFy ZW50KSkgewogICAgICAgICAgICAgcHVzaChAcHJvdG9jb2xzLCAiRE9NIiAuICRmaXJzdFBhcmVu dCk7CkBAIC02ODQsMTggKzY4NCwxOCBAQCBzdWIgR2V0U1ZHUHJvcGVydHlUeXBlcwogc3ViIEdl bmVyYXRlSGVhZGVyCiB7CiAgICAgbXkgJG9iamVjdCA9IHNoaWZ0OwotICAgIG15ICRkYXRhTm9k ZSA9IHNoaWZ0OworICAgIG15ICRpbnRlcmZhY2UgPSBzaGlmdDsKIAotICAgIG15ICRpbnRlcmZh Y2VOYW1lID0gJGRhdGFOb2RlLT5uYW1lOworICAgIG15ICRpbnRlcmZhY2VOYW1lID0gJGludGVy ZmFjZS0+bmFtZTsKICAgICBteSAkY2xhc3NOYW1lID0gR2V0Q2xhc3NOYW1lKCRpbnRlcmZhY2VO YW1lKTsKIAogICAgIG15ICRwYXJlbnROYW1lID0gIiI7CiAgICAgbXkgQHByb3RvY29sc1RvSW1w bGVtZW50ID0gKCk7Ci0gICAgKCRwYXJlbnROYW1lLCBAcHJvdG9jb2xzVG9JbXBsZW1lbnQpID0g R2V0UGFyZW50QW5kUHJvdG9jb2xzKCRkYXRhTm9kZSk7CisgICAgKCRwYXJlbnROYW1lLCBAcHJv dG9jb2xzVG9JbXBsZW1lbnQpID0gR2V0UGFyZW50QW5kUHJvdG9jb2xzKCRpbnRlcmZhY2UpOwog Ci0gICAgbXkgJG51bUNvbnN0YW50cyA9IEB7JGRhdGFOb2RlLT5jb25zdGFudHN9OwotICAgIG15 ICRudW1BdHRyaWJ1dGVzID0gQHskZGF0YU5vZGUtPmF0dHJpYnV0ZXN9OwotICAgIG15ICRudW1G dW5jdGlvbnMgPSBAeyRkYXRhTm9kZS0+ZnVuY3Rpb25zfTsKKyAgICBteSAkbnVtQ29uc3RhbnRz ID0gQHskaW50ZXJmYWNlLT5jb25zdGFudHN9OworICAgIG15ICRudW1BdHRyaWJ1dGVzID0gQHsk aW50ZXJmYWNlLT5hdHRyaWJ1dGVzfTsKKyAgICBteSAkbnVtRnVuY3Rpb25zID0gQHskaW50ZXJm YWNlLT5mdW5jdGlvbnN9OwogCiAgICAgIyAtIEFkZCBkZWZhdWx0IGhlYWRlciB0ZW1wbGF0ZQog ICAgIEBoZWFkZXJDb250ZW50SGVhZGVyID0gc3BsaXQoIlxyIiwgJGhlYWRlckxpY2Vuc2VUZW1w bGF0ZSk7CkBAIC03MzQsNyArNzM0LDcgQEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAgICAgIyAtIEFk ZCBjb25zdGFudHMuCiAgICAgaWYgKCRudW1Db25zdGFudHMgPiAwKSB7CiAgICAgICAgIG15IEBo ZWFkZXJDb25zdGFudHMgPSAoKTsKLSAgICAgICAgbXkgQGNvbnN0YW50cyA9IEB7JGRhdGFOb2Rl LT5jb25zdGFudHN9OworICAgICAgICBteSBAY29uc3RhbnRzID0gQHskaW50ZXJmYWNlLT5jb25z dGFudHN9OwogICAgICAgICBteSAkY29tYmluZWRDb25zdGFudHMgPSAiIjsKIAogICAgICAgICAj IEZJWE1FOiB3ZSBuZWVkIGEgd2F5IHRvIGluY2x1ZGUgbXVsdGlwbGUgZW51bXMuCkBAIC03NzYs NyArNzc2LDcgQEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAKICAgICAjIC0gQWRkIGF0dHJpYnV0ZSBn ZXR0ZXJzL3NldHRlcnMuCiAgICAgaWYgKCRudW1BdHRyaWJ1dGVzID4gMCkgewotICAgICAgICBm b3JlYWNoIG15ICRhdHRyaWJ1dGUgKEB7JGRhdGFOb2RlLT5hdHRyaWJ1dGVzfSkgeworICAgICAg ICBmb3JlYWNoIG15ICRhdHRyaWJ1dGUgKEB7JGludGVyZmFjZS0+YXR0cmlidXRlc30pIHsKICAg ICAgICAgICAgIG5leHQgaWYgU2tpcEF0dHJpYnV0ZSgkYXR0cmlidXRlKTsKICAgICAgICAgICAg IG15ICRhdHRyaWJ1dGVOYW1lID0gJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5uYW1lOwogCkBAIC04 MzksOSArODM5LDkgQEAgc3ViIEdlbmVyYXRlSGVhZGVyCiAKICAgICAjIC0gQWRkIGZ1bmN0aW9u cy4KICAgICBpZiAoJG51bUZ1bmN0aW9ucyA+IDApIHsKLSAgICAgICAgZm9yZWFjaCBteSAkZnVu Y3Rpb24gKEB7JGRhdGFOb2RlLT5mdW5jdGlvbnN9KSB7CisgICAgICAgIGZvcmVhY2ggbXkgJGZ1 bmN0aW9uIChAeyRpbnRlcmZhY2UtPmZ1bmN0aW9uc30pIHsKICAgICAgICAgICAgIG5leHQgaWYg U2tpcEZ1bmN0aW9uKCRmdW5jdGlvbik7Ci0gICAgICAgICAgICBuZXh0IGlmICgkZnVuY3Rpb24t PnNpZ25hdHVyZS0+bmFtZSBlcSAic2V0IiBhbmQgJGRhdGFOb2RlLT5leHRlbmRlZEF0dHJpYnV0 ZXMtPnsiVHlwZWRBcnJheSJ9KTsKKyAgICAgICAgICAgIG5leHQgaWYgKCRmdW5jdGlvbi0+c2ln bmF0dXJlLT5uYW1lIGVxICJzZXQiIGFuZCAkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMt PnsiVHlwZWRBcnJheSJ9KTsKICAgICAgICAgICAgIG15ICRmdW5jdGlvbk5hbWUgPSAkZnVuY3Rp b24tPnNpZ25hdHVyZS0+bmFtZTsKIAogICAgICAgICAgICAgbXkgJHJldHVyblR5cGUgPSBHZXRP YmpDVHlwZSgkZnVuY3Rpb24tPnNpZ25hdHVyZS0+dHlwZSk7CkBAIC0xMDI3LDcgKzEwMjcsNyBA QCBzdWIgR2VuZXJhdGVIZWFkZXIKICAgICAgICAgcHVzaChAaW50ZXJuYWxIZWFkZXJDb250ZW50 LCAiJGltcGxUeXBlKiBjb3JlKCRjbGFzc05hbWUgKik7XG4iKTsKICAgICAgICAgcHVzaChAaW50 ZXJuYWxIZWFkZXJDb250ZW50LCAiJGNsYXNzTmFtZSAqa2l0KCRpbXBsVHlwZSopO1xuIik7CiAK LSAgICAgICAgaWYgKCRkYXRhTm9kZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57Ik9iakNQb2x5bW9y cGhpYyJ9KSB7CisgICAgICAgIGlmICgkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsi T2JqQ1BvbHltb3JwaGljIn0pIHsKICAgICAgICAgICAgIHB1c2goQGludGVybmFsSGVhZGVyQ29u dGVudCwgIkNsYXNzIGtpdENsYXNzKCRpbXBsVHlwZSopO1xuIik7CiAgICAgICAgIH0KIApAQCAt MTA0MiwyNCArMTA0MiwyNCBAQCBzdWIgR2VuZXJhdGVIZWFkZXIKIHN1YiBHZW5lcmF0ZUltcGxl bWVudGF0aW9uCiB7CiAgICAgbXkgJG9iamVjdCA9IHNoaWZ0OwotICAgIG15ICRkYXRhTm9kZSA9 IHNoaWZ0OworICAgIG15ICRpbnRlcmZhY2UgPSBzaGlmdDsKIAogICAgIG15IEBhbmNlc3Rvcklu dGVyZmFjZU5hbWVzID0gKCk7CiAKLSAgICBpZiAoQHskZGF0YU5vZGUtPnBhcmVudHN9ID4gMSkg ewotICAgICAgICAkY29kZUdlbmVyYXRvci0+QWRkTWV0aG9kc0NvbnN0YW50c0FuZEF0dHJpYnV0 ZXNGcm9tUGFyZW50SW50ZXJmYWNlcygkZGF0YU5vZGUsIFxAYW5jZXN0b3JJbnRlcmZhY2VOYW1l cyk7CisgICAgaWYgKEB7JGludGVyZmFjZS0+cGFyZW50c30gPiAxKSB7CisgICAgICAgICRjb2Rl R2VuZXJhdG9yLT5BZGRNZXRob2RzQ29uc3RhbnRzQW5kQXR0cmlidXRlc0Zyb21QYXJlbnRJbnRl cmZhY2VzKCRpbnRlcmZhY2UsIFxAYW5jZXN0b3JJbnRlcmZhY2VOYW1lcyk7CiAgICAgfQogCi0g ICAgbXkgJGludGVyZmFjZU5hbWUgPSAkZGF0YU5vZGUtPm5hbWU7CisgICAgbXkgJGludGVyZmFj ZU5hbWUgPSAkaW50ZXJmYWNlLT5uYW1lOwogICAgIG15ICRjbGFzc05hbWUgPSBHZXRDbGFzc05h bWUoJGludGVyZmFjZU5hbWUpOwogICAgIG15ICRpbXBsQ2xhc3NOYW1lID0gR2V0SW1wbENsYXNz TmFtZSgkaW50ZXJmYWNlTmFtZSk7Ci0gICAgbXkgJHBhcmVudEltcGxDbGFzc05hbWUgPSBHZXRQ YXJlbnRJbXBsQ2xhc3NOYW1lKCRkYXRhTm9kZSk7CisgICAgbXkgJHBhcmVudEltcGxDbGFzc05h bWUgPSBHZXRQYXJlbnRJbXBsQ2xhc3NOYW1lKCRpbnRlcmZhY2UpOwogICAgIG15ICRpbXBsQ2xh c3NOYW1lV2l0aE5hbWVzcGFjZSA9ICJXZWJDb3JlOjoiIC4gJGltcGxDbGFzc05hbWU7CiAgICAg bXkgJGJhc2VDbGFzcyA9IEdldEJhc2VDbGFzcygkcGFyZW50SW1wbENsYXNzTmFtZSk7CiAgICAg bXkgJGNsYXNzSGVhZGVyTmFtZSA9IEdldENsYXNzSGVhZGVyTmFtZSgkY2xhc3NOYW1lKTsKIAot ICAgIG15ICRudW1BdHRyaWJ1dGVzID0gQHskZGF0YU5vZGUtPmF0dHJpYnV0ZXN9OwotICAgIG15 ICRudW1GdW5jdGlvbnMgPSBAeyRkYXRhTm9kZS0+ZnVuY3Rpb25zfTsKKyAgICBteSAkbnVtQXR0 cmlidXRlcyA9IEB7JGludGVyZmFjZS0+YXR0cmlidXRlc307CisgICAgbXkgJG51bUZ1bmN0aW9u cyA9IEB7JGludGVyZmFjZS0+ZnVuY3Rpb25zfTsKICAgICBteSAkaW1wbFR5cGUgPSAkaW1wbENs YXNzTmFtZVdpdGhOYW1lc3BhY2U7CiAKICAgICBteSAoJHN2Z1Byb3BlcnR5VHlwZSwgJHN2Z0xp c3RQcm9wZXJ0eVR5cGUsICRzdmdOYXRpdmVUeXBlKSA9IEdldFNWR1Byb3BlcnR5VHlwZXMoJGlt cGxDbGFzc05hbWUpOwpAQCAtMTA3MSw3ICsxMDcxLDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50 YXRpb24KICAgICAjIC0gSU5DTFVERVMgLQogICAgIHB1c2goQGltcGxDb250ZW50SGVhZGVyLCAi XG4jaW1wb3J0IFwiY29uZmlnLmhcIlxuIik7CiAKLSAgICBteSAkY29uZGl0aW9uYWxTdHJpbmcg PSAkY29kZUdlbmVyYXRvci0+R2VuZXJhdGVDb25kaXRpb25hbFN0cmluZygkZGF0YU5vZGUpOwor ICAgIG15ICRjb25kaXRpb25hbFN0cmluZyA9ICRjb2RlR2VuZXJhdG9yLT5HZW5lcmF0ZUNvbmRp dGlvbmFsU3RyaW5nKCRpbnRlcmZhY2UpOwogICAgIHB1c2goQGltcGxDb250ZW50SGVhZGVyLCAi XG4jaWYgJHtjb25kaXRpb25hbFN0cmluZ31cblxuIikgaWYgJGNvbmRpdGlvbmFsU3RyaW5nOwog CiAgICAgcHVzaChAaW1wbENvbnRlbnRIZWFkZXIsICIjaW1wb3J0IFwiRE9NSW50ZXJuYWwuaFwi XG5cbiIpOwpAQCAtMTE1OSw3ICsxMTU5LDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24K IAogICAgICMgLSBBdHRyaWJ1dGVzCiAgICAgaWYgKCRudW1BdHRyaWJ1dGVzID4gMCkgewotICAg ICAgICBmb3JlYWNoIG15ICRhdHRyaWJ1dGUgKEB7JGRhdGFOb2RlLT5hdHRyaWJ1dGVzfSkgewor ICAgICAgICBmb3JlYWNoIG15ICRhdHRyaWJ1dGUgKEB7JGludGVyZmFjZS0+YXR0cmlidXRlc30p IHsKICAgICAgICAgICAgIG5leHQgaWYgU2tpcEF0dHJpYnV0ZSgkYXR0cmlidXRlKTsKICAgICAg ICAgICAgIEFkZEluY2x1ZGVzRm9yVHlwZSgkYXR0cmlidXRlLT5zaWduYXR1cmUtPnR5cGUpOwog CkBAIC0xNDU2LDkgKzE0NTYsOSBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogCiAgICAg IyAtIEZ1bmN0aW9ucwogICAgIGlmICgkbnVtRnVuY3Rpb25zID4gMCkgewotICAgICAgICBmb3Jl YWNoIG15ICRmdW5jdGlvbiAoQHskZGF0YU5vZGUtPmZ1bmN0aW9uc30pIHsKKyAgICAgICAgZm9y ZWFjaCBteSAkZnVuY3Rpb24gKEB7JGludGVyZmFjZS0+ZnVuY3Rpb25zfSkgewogICAgICAgICAg ICAgbmV4dCBpZiBTa2lwRnVuY3Rpb24oJGZ1bmN0aW9uKTsKLSAgICAgICAgICAgIG5leHQgaWYg KCRmdW5jdGlvbi0+c2lnbmF0dXJlLT5uYW1lIGVxICJzZXQiIGFuZCAkZGF0YU5vZGUtPmV4dGVu ZGVkQXR0cmlidXRlcy0+eyJUeXBlZEFycmF5In0pOworICAgICAgICAgICAgbmV4dCBpZiAoJGZ1 bmN0aW9uLT5zaWduYXR1cmUtPm5hbWUgZXEgInNldCIgYW5kICRpbnRlcmZhY2UtPmV4dGVuZGVk QXR0cmlidXRlcy0+eyJUeXBlZEFycmF5In0pOwogICAgICAgICAgICAgQWRkSW5jbHVkZXNGb3JU eXBlKCRmdW5jdGlvbi0+c2lnbmF0dXJlLT50eXBlKTsKIAogICAgICAgICAgICAgbXkgJGZ1bmN0 aW9uTmFtZSA9ICRmdW5jdGlvbi0+c2lnbmF0dXJlLT5uYW1lOwpAQCAtMTcxOCw3ICsxNzE4LDcg QEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIgICAgICAgIHJldHVybiBuaWw7XG4iKTsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIg ICAgaWYgKCRjbGFzc05hbWUgKndyYXBwZXIgPSBnZXRET01XcmFwcGVyKHZhbHVlKSlcbiIpOwog ICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgcmV0dXJuIFtbd3JhcHBlciByZXRh aW5dIGF1dG9yZWxlYXNlXTtcbiIpOwotICAgICAgICBpZiAoJGRhdGFOb2RlLT5leHRlbmRlZEF0 dHJpYnV0ZXMtPnsiT2JqQ1BvbHltb3JwaGljIn0pIHsKKyAgICAgICAgaWYgKCRpbnRlcmZhY2Ut PmV4dGVuZGVkQXR0cmlidXRlcy0+eyJPYmpDUG9seW1vcnBoaWMifSkgewogICAgICAgICAgICAg cHVzaChAaW1wbENvbnRlbnQsICIgICAgJGNsYXNzTmFtZSAqd3JhcHBlciA9IFtba2l0Q2xhc3Mo dmFsdWUpIGFsbG9jXSBfaW5pdF07XG4iKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50 LCAiICAgIGlmICghd3JhcHBlcilcbiIpOwogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIgICAgICAgIHJldHVybiBuaWw7XG4iKTsK