163767 2016-10-20 16:51:10 -0700 [Bindings] Start using signature->idlType instead of signature->type in the overload resolution code 2016-10-20 18:29:51 -0700 1 1 1 Unclassified WebKit Bindings WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 163764 1 cdumez cdumez cdumez commit-queue darin sam oldest_to_newest 1242663 0 cdumez 2016-10-20 16:51:10 -0700 Start using signature->idlType instead of signature->type in the overload resolution code so that we can add support for unions. 1242673 1 292287 cdumez 2016-10-20 17:02:40 -0700 Created attachment 292287 WIP Patch 1242674 2 292288 cdumez 2016-10-20 17:07:58 -0700 Created attachment 292288 Patch 1242721 3 292288 commit-queue 2016-10-20 18:29:47 -0700 Comment on attachment 292288 Patch Clearing flags on attachment: 292288 Committed r207651: <http://trac.webkit.org/changeset/207651> 1242722 4 commit-queue 2016-10-20 18:29:51 -0700 All reviewed patches have been landed. Closing bug. 292287 2016-10-20 17:02:40 -0700 2016-10-20 17:07:55 -0700 WIP Patch idlType_overload_resolution_wip.patch text/plain 10089 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv ckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG0KaW5kZXggODBmNTI1NS4uNDc2YTk2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KQEAgLTE5MTQsNyArMTkxNCw3IEBAIHN1 YiBDb21wdXRlRWZmZWN0aXZlT3ZlcmxvYWRTZXQKICAgICAgICAgbXkgQG87CiAgICAgICAgIG15 ICRpc1ZhcmlhZGljID0gMDsKICAgICAgICAgZm9yZWFjaCBteSAkcGFyYW1ldGVyIChAeyRvdmVy bG9hZC0+cGFyYW1ldGVyc30pIHsKLSAgICAgICAgICAgIHB1c2goQHQsICRwYXJhbWV0ZXItPmlz TnVsbGFibGUgPyAkcGFyYW1ldGVyLT50eXBlIC4gIj8iIDogJHBhcmFtZXRlci0+dHlwZSk7Cisg ICAgICAgICAgICBwdXNoKEB0LCAkcGFyYW1ldGVyLT5pZGxUeXBlKTsKICAgICAgICAgICAgIGlm ICgkcGFyYW1ldGVyLT5pc09wdGlvbmFsKSB7CiAgICAgICAgICAgICAgICAgcHVzaChAbywgIm9w dGlvbmFsIik7CiAgICAgICAgICAgICB9IGVsc2lmICgkcGFyYW1ldGVyLT5pc1ZhcmlhZGljKSB7 CkBAIC0xOTUwLDcgKzE5NTAsNyBAQCBzdWIgQ29tcHV0ZUVmZmVjdGl2ZU92ZXJsb2FkU2V0CiAj IGh0dHA6Ly9oZXljYW0uZ2l0aHViLmlvL3dlYmlkbC8jZGZuLWRpc3Rpbmd1aXNoYWJsZQogc3Vi IEFyZVR5cGVzRGlzdGluZ3Vpc2hhYmxlRm9yT3ZlcmxvYWRSZXNvbHV0aW9uCiB7Ci0gICAgbXkg KCR0eXBlQSwgJHR5cGVCKSA9IEBfOworICAgIG15ICgkaWRsVHlwZUEsICRpZGxUeXBlQikgPSBA XzsKIAogICAgIG15ICRpc0RpY3Rpb25hcnkgPSBzdWIgewogICAgICAgICBteSAkdHlwZSA9IHNo aWZ0OwpAQCAtMTk2MCwyMiArMTk2MCwyNiBAQCBzdWIgQXJlVHlwZXNEaXN0aW5ndWlzaGFibGVG b3JPdmVybG9hZFJlc29sdXRpb24KICAgICAgICAgbXkgJHR5cGUgPSBzaGlmdDsKICAgICAgICAg cmV0dXJuICRjb2RlR2VuZXJhdG9yLT5Jc0Z1bmN0aW9uT25seUNhbGxiYWNrSW50ZXJmYWNlKCR0 eXBlKSB8fCAmJGlzRGljdGlvbmFyeSgkdHlwZSk7CiAgICAgfTsKKyAgICAKKyAgICAjIEZJWE1F OiBBZGQgc3VwcG9ydCBmb3IgdW5pb24gdHlwZXMuCisgICAgIyBpZGxUeXBlQSBhbmQgaWRsVHlw ZUIgIGFyZSBkaXN0aW5ndWlzaGFibGUgaWY6CisgICAgIyAtIE9uZSB0eXBlIGlzIGEgdW5pb24g dHlwZSBvciBudWxsYWJsZSB1bmlvbiB0eXBlLCB0aGUgb3RoZXIgaXMgbmVpdGhlciBhIHVuaW9u IHR5cGUgbm9yIGEgbnVsbGFibGUKKyAgICAjICAgdW5pb24gdHlwZSwgYW5kIGVhY2ggbWVtYmVy IHR5cGUgb2YgdGhlIGZpcnN0IGlzIGRpc3Rpbmd1aXNoYWJsZSB3aXRoIHRoZSBzZWNvbmQuCisg ICAgIyAtIEJvdGggdHlwZXMgYXJlIGVpdGhlciBhIHVuaW9uIHR5cGUgb3IgbnVsbGFibGUgdW5p b24gdHlwZSwgYW5kIGVhY2ggbWVtYmVyIHR5cGUgb2YgdGhlIG9uZSBpcworICAgICMgICBkaXN0 aW5ndWlzaGFibGUgd2l0aCBlYWNoIG1lbWJlciB0eXBlIG9mIHRoZSBvdGhlci4KIAogICAgICMg RklYTUU6IFRoZSBXZWJJREwgbWFuZGF0ZXMgdGhpcyBidXQgdGhpcyBjdXJyZW50bHkgZG9lcyBu b3Qgd29yayBiZWNhdXNlIHNvbWUgb2Ygb3VyIElETCBpcyB3cm9uZy4KLSAgICAjIHJldHVybiAw IGlmIElzTnVsbGFibGVUeXBlKCR0eXBlQSkgJiYgSXNOdWxsYWJsZVR5cGUoJHR5cGVCKTsKLQot ICAgICR0eXBlQSA9IFN0cmlwTnVsbGFibGUoJHR5cGVBKTsKLSAgICAkdHlwZUIgPSBTdHJpcE51 bGxhYmxlKCR0eXBlQik7Ci0KLSAgICByZXR1cm4gMCBpZiAkdHlwZUEgZXEgJHR5cGVCOwotICAg IHJldHVybiAwIGlmICR0eXBlQSBlcSAib2JqZWN0IiBvciAkdHlwZUIgZXEgIm9iamVjdCI7Ci0g ICAgcmV0dXJuIDAgaWYgJGNvZGVHZW5lcmF0b3ItPklzTnVtZXJpY1R5cGUoJHR5cGVBKSAmJiAk Y29kZUdlbmVyYXRvci0+SXNOdW1lcmljVHlwZSgkdHlwZUIpOwotICAgIHJldHVybiAwIGlmICRj b2RlR2VuZXJhdG9yLT5Jc1N0cmluZ09yRW51bVR5cGUoJHR5cGVBKSAmJiAkY29kZUdlbmVyYXRv ci0+SXNTdHJpbmdPckVudW1UeXBlKCR0eXBlQik7Ci0gICAgcmV0dXJuIDAgaWYgJiRpc0RpY3Rp b25hcnkoJHR5cGVBKSAmJiAmJGlzRGljdGlvbmFyeSgkdHlwZUIpOwotICAgIHJldHVybiAwIGlm ICRjb2RlR2VuZXJhdG9yLT5Jc0NhbGxiYWNrSW50ZXJmYWNlKCR0eXBlQSkgJiYgJGNvZGVHZW5l cmF0b3ItPklzQ2FsbGJhY2tJbnRlcmZhY2UoJHR5cGVCKTsKLSAgICByZXR1cm4gMCBpZiAmJGlz Q2FsbGJhY2tGdW5jdGlvbk9yRGljdGlvbmFyeSgkdHlwZUEpICYmICYkaXNDYWxsYmFja0Z1bmN0 aW9uT3JEaWN0aW9uYXJ5KCR0eXBlQik7Ci0gICAgcmV0dXJuIDAgaWYgJGNvZGVHZW5lcmF0b3It PklzU2VxdWVuY2VPckZyb3plbkFycmF5VHlwZSgkdHlwZUEpICYmICRjb2RlR2VuZXJhdG9yLT5J c1NlcXVlbmNlT3JGcm96ZW5BcnJheVR5cGUoJHR5cGVCKTsKLSAgICAjIEZJWE1FOiByZXR1cm4g MCBpZiB0eXBlQSBhbmQgdHlwZUIgYXJlIGJvdGggZXhjZXB0aW9uIHR5cGVzLgorICAgICMgcmV0 dXJuIDAgaWYgJGlkbFR5cGVBLT5pc051bGxhYmxlICYmICRpZGxUeXBlQi0+aXNOdWxsYWJsZTsK KworICAgIHJldHVybiAwIGlmICRpZGxUeXBlQS0+bmFtZSBlcSAkaWRsVHlwZUItPm5hbWU7Cisg ICAgcmV0dXJuIDAgaWYgJGlkbFR5cGVBLT5uYW1lIGVxICJvYmplY3QiIG9yICRpZGxUeXBlQi0+ bmFtZSBlcSAib2JqZWN0IjsKKyAgICByZXR1cm4gMCBpZiAkY29kZUdlbmVyYXRvci0+SXNOdW1l cmljVHlwZSgkaWRsVHlwZUEtPm5hbWUpICYmICRjb2RlR2VuZXJhdG9yLT5Jc051bWVyaWNUeXBl KCRpZGxUeXBlQi0+bmFtZSk7CisgICAgcmV0dXJuIDAgaWYgJGNvZGVHZW5lcmF0b3ItPklzU3Ry aW5nT3JFbnVtVHlwZSgkaWRsVHlwZUEtPm5hbWUpICYmICRjb2RlR2VuZXJhdG9yLT5Jc1N0cmlu Z09yRW51bVR5cGUoJGlkbFR5cGVCLT5uYW1lKTsKKyAgICByZXR1cm4gMCBpZiAmJGlzRGljdGlv bmFyeSgkaWRsVHlwZUEtPm5hbWUpICYmICYkaXNEaWN0aW9uYXJ5KCRpZGxUeXBlQi0+bmFtZSk7 CisgICAgcmV0dXJuIDAgaWYgJGNvZGVHZW5lcmF0b3ItPklzQ2FsbGJhY2tJbnRlcmZhY2UoJGlk bFR5cGVBLT5uYW1lKSAmJiAkY29kZUdlbmVyYXRvci0+SXNDYWxsYmFja0ludGVyZmFjZSgkaWRs VHlwZUItPm5hbWUpOworICAgIHJldHVybiAwIGlmICYkaXNDYWxsYmFja0Z1bmN0aW9uT3JEaWN0 aW9uYXJ5KCRpZGxUeXBlQS0+bmFtZSkgJiYgJiRpc0NhbGxiYWNrRnVuY3Rpb25PckRpY3Rpb25h cnkoJGlkbFR5cGVCLT5uYW1lKTsKKyAgICByZXR1cm4gMCBpZiAkY29kZUdlbmVyYXRvci0+SXNT ZXF1ZW5jZU9yRnJvemVuQXJyYXlUeXBlKCRpZGxUeXBlQS0+bmFtZSkgJiYgJGNvZGVHZW5lcmF0 b3ItPklzU2VxdWVuY2VPckZyb3plbkFycmF5VHlwZSgkaWRsVHlwZUItPm5hbWUpOworICAgICMg RklYTUU6IHJldHVybiAwIGlmICRpZGxUeXBlQSBhbmQgJGlkbFR5cGVCIGFyZSBib3RoIGV4Y2Vw dGlvbiB0eXBlcy4KICAgICByZXR1cm4gMTsKIH0KIApAQCAtMTk4OCwxMiArMTk5MiwxMiBAQCBz dWIgR2V0RGlzdGluZ3Vpc2hpbmdBcmd1bWVudEluZGV4CiAgICAgbXkgKCRmdW5jdGlvbiwgJFMp ID0gQF87CiAKICAgICAjIEZJWE1FOiBDb25zaWRlciBhbGwgdGhlIHR1cGxlcywgbm90IGp1c3Qg dGhlIDIgZmlyc3Qgb25lcz8KLSAgICBteSAkZmlyc3RUdXBsZVR5cGVzID0gQHtAeyRTfVswXX1b MV07Ci0gICAgbXkgJHNlY29uZFR1cGxlVHlwZXMgPSBAe0B7JFN9WzFdfVsxXTsKLSAgICBmb3Ig KG15ICRpbmRleCA9IDA7ICRpbmRleCA8IHNjYWxhcihAJGZpcnN0VHVwbGVUeXBlcyk7ICRpbmRl eCsrKSB7Ci0gICAgICAgIHJldHVybiAkaW5kZXggaWYgQXJlVHlwZXNEaXN0aW5ndWlzaGFibGVG b3JPdmVybG9hZFJlc29sdXRpb24oQHskZmlyc3RUdXBsZVR5cGVzfVskaW5kZXhdLCBAeyRzZWNv bmRUdXBsZVR5cGVzfVskaW5kZXhdKTsKKyAgICBteSAkZmlyc3RUdXBsZUlETFR5cGVzID0gQHtA eyRTfVswXX1bMV07CisgICAgbXkgJHNlY29uZFR1cGxlSURMVHlwZXMgPSBAe0B7JFN9WzFdfVsx XTsKKyAgICBmb3IgKG15ICRpbmRleCA9IDA7ICRpbmRleCA8IHNjYWxhcihAJGZpcnN0VHVwbGVJ RExUeXBlcyk7ICRpbmRleCsrKSB7CisgICAgICAgIHJldHVybiAkaW5kZXggaWYgQXJlVHlwZXNE aXN0aW5ndWlzaGFibGVGb3JPdmVybG9hZFJlc29sdXRpb24oQHskZmlyc3RUdXBsZUlETFR5cGVz fVskaW5kZXhdLCBAeyRzZWNvbmRUdXBsZUlETFR5cGVzfVskaW5kZXhdKTsKICAgICB9Ci0gICAg ZGllICJVbmRpc3Rpbmd1aXNoYWJsZSBvdmVybG9hZHMgZm9yIG9wZXJhdGlvbiAiIC4gJGZ1bmN0 aW9uLT5zaWduYXR1cmUtPm5hbWUgLiAiIHdpdGggbGVuZ3RoOiAiIC4gc2NhbGFyKEAkZmlyc3RU dXBsZVR5cGVzKTsKKyAgICBkaWUgIlVuZGlzdGluZ3Vpc2hhYmxlIG92ZXJsb2FkcyBmb3Igb3Bl cmF0aW9uICIgLiAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+bmFtZSAuICIgd2l0aCBsZW5ndGg6ICIg LiBzY2FsYXIoQCRmaXJzdFR1cGxlSURMVHlwZXMpOwogfQogCiBzdWIgR2V0T3ZlcmxvYWRUaGF0 TWF0Y2hlcwpAQCAtMjAwMSwxMCArMjAwNSw5IEBAIHN1YiBHZXRPdmVybG9hZFRoYXRNYXRjaGVz CiAgICAgbXkgKCRTLCAkcGFyYW1ldGVySW5kZXgsICRtYXRjaGVzKSA9IEBfOwogCiAgICAgZm9y IG15ICR0dXBsZSAoQHskU30pIHsKLSAgICAgICAgbXkgJHR5cGUgPSBAe0B7JHR1cGxlfVsxXX1b JHBhcmFtZXRlckluZGV4XTsKKyAgICAgICAgbXkgJGlkbFR5cGUgPSBAe0B7JHR1cGxlfVsxXX1b JHBhcmFtZXRlckluZGV4XTsKICAgICAgICAgbXkgJG9wdGlvbmFsaXR5ID0gQHtAeyR0dXBsZX1b Ml19WyRwYXJhbWV0ZXJJbmRleF07Ci0gICAgICAgIG15ICRpc051bGxhYmxlID0gSXNOdWxsYWJs ZVR5cGUoJHR5cGUpOwotICAgICAgICByZXR1cm4gQHskdHVwbGV9WzBdIGlmICRtYXRjaGVzLT4o U3RyaXBOdWxsYWJsZSgkdHlwZSksICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUpOworICAgICAg ICByZXR1cm4gQHskdHVwbGV9WzBdIGlmICRtYXRjaGVzLT4oJGlkbFR5cGUsICRvcHRpb25hbGl0 eSk7CiAgICAgfQogfQogCkBAIC0yMDUwLDYwICsyMDUzLDYwIEBAIHN1YiBHZW5lcmF0ZU92ZXJs b2FkZWRGdW5jdGlvbk9yQ29uc3RydWN0b3IKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIj ZW5kaWZcbiIpIGlmICRjb25kaXRpb25hbFN0cmluZzsKICAgICB9OwogICAgIG15ICRpc09wdGlv bmFsUGFyYW1ldGVyID0gc3ViIHsKLSAgICAgICAgbXkgKCR0eXBlLCAkb3B0aW9uYWxpdHksICRp c051bGxhYmxlKSA9IEBfOworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBA XzsKICAgICAgICAgcmV0dXJuICRvcHRpb25hbGl0eSBlcSAib3B0aW9uYWwiOwogICAgIH07CiAg ICAgbXkgJGlzRGljdGlvbmFyeVBhcmFtZXRlciA9IHN1YiB7Ci0gICAgICAgIG15ICgkdHlwZSwg JG9wdGlvbmFsaXR5LCAkaXNOdWxsYWJsZSkgPSBAXzsKLSAgICAgICAgcmV0dXJuICR0eXBlIGVx ICJEaWN0aW9uYXJ5IiB8fCAkY29kZUdlbmVyYXRvci0+SXNEaWN0aW9uYXJ5VHlwZSgkdHlwZSk7 CisgICAgICAgIG15ICgkaWRsVHlwZSwgJG9wdGlvbmFsaXR5KSA9IEBfOworICAgICAgICByZXR1 cm4gJGlkbFR5cGUtPm5hbWUgZXEgIkRpY3Rpb25hcnkiIHx8ICRjb2RlR2VuZXJhdG9yLT5Jc0Rp Y3Rpb25hcnlUeXBlKCRpZGxUeXBlLT5uYW1lKTsKICAgICB9OwogICAgIG15ICRpc051bGxhYmxl T3JEaWN0aW9uYXJ5UGFyYW1ldGVyID0gc3ViIHsKLSAgICAgICAgbXkgKCR0eXBlLCAkb3B0aW9u YWxpdHksICRpc051bGxhYmxlKSA9IEBfOwotICAgICAgICByZXR1cm4gJGlzTnVsbGFibGUgfHwg JiRpc0RpY3Rpb25hcnlQYXJhbWV0ZXIoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUp OworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBAXzsKKyAgICAgICAgcmV0 dXJuICRpZGxUeXBlLT5pc051bGxhYmxlIHx8ICYkaXNEaWN0aW9uYXJ5UGFyYW1ldGVyKCRpZGxU eXBlLCAkb3B0aW9uYWxpdHkpOwogICAgIH07CiAgICAgbXkgJGlzUmVnRXhwT3JPYmplY3RQYXJh bWV0ZXIgPSBzdWIgewotICAgICAgICBteSAoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFi bGUpID0gQF87Ci0gICAgICAgIHJldHVybiAkdHlwZSBlcSAiUmVnRXhwIiB8fCAkdHlwZSBlcSAi b2JqZWN0IjsKKyAgICAgICAgbXkgKCRpZGxUeXBlLCAkb3B0aW9uYWxpdHkpID0gQF87CisgICAg ICAgIHJldHVybiAkaWRsVHlwZS0+bmFtZSBlcSAiUmVnRXhwIiB8fCAkaWRsVHlwZS0+bmFtZSBl cSAib2JqZWN0IjsKICAgICB9OwogICAgIG15ICRpc09iamVjdE9yRXJyb3JQYXJhbWV0ZXIgPSBz dWIgewotICAgICAgICBteSAoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUpID0gQF87 Ci0gICAgICAgIHJldHVybiAkdHlwZSBlcSAib2JqZWN0IiB8fCAkdHlwZSBlcSAiRXJyb3IiOwor ICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBAXzsKKyAgICAgICAgcmV0dXJu ICRpZGxUeXBlLT5uYW1lIGVxICJvYmplY3QiIHx8ICRpZGxUeXBlLT5uYW1lIGVxICJFcnJvciI7 CiAgICAgfTsKICAgICBteSAkaXNPYmplY3RPckVycm9yT3JET01FeGNlcHRpb25QYXJhbWV0ZXIg PSBzdWIgewotICAgICAgICBteSAoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUpID0g QF87Ci0gICAgICAgIHJldHVybiAxIGlmICYkaXNPYmplY3RPckVycm9yUGFyYW1ldGVyKCR0eXBl LCAkb3B0aW9uYWxpdHksICRpc051bGxhYmxlKTsKLSAgICAgICAgcmV0dXJuICR0eXBlIGVxICJE T01FeGNlcHRpb24iOworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBAXzsK KyAgICAgICAgcmV0dXJuIDEgaWYgJiRpc09iamVjdE9yRXJyb3JQYXJhbWV0ZXIoJGlkbFR5cGUs ICRvcHRpb25hbGl0eSk7CisgICAgICAgIHJldHVybiAkaWRsVHlwZS0+bmFtZSBlcSAiRE9NRXhj ZXB0aW9uIjsKICAgICB9OwogICAgIG15ICRpc09iamVjdE9yQ2FsbGJhY2tGdW5jdGlvblBhcmFt ZXRlciA9IHN1YiB7Ci0gICAgICAgIG15ICgkdHlwZSwgJG9wdGlvbmFsaXR5LCAkaXNOdWxsYWJs ZSkgPSBAXzsKLSAgICAgICAgcmV0dXJuICR0eXBlIGVxICJvYmplY3QiIHx8ICRjb2RlR2VuZXJh dG9yLT5Jc0Z1bmN0aW9uT25seUNhbGxiYWNrSW50ZXJmYWNlKCR0eXBlKTsKKyAgICAgICAgbXkg KCRpZGxUeXBlLCAkb3B0aW9uYWxpdHkpID0gQF87CisgICAgICAgIHJldHVybiAkaWRsVHlwZS0+ bmFtZSBlcSAib2JqZWN0IiB8fCAkY29kZUdlbmVyYXRvci0+SXNGdW5jdGlvbk9ubHlDYWxsYmFj a0ludGVyZmFjZSgkaWRsVHlwZS0+bmFtZSk7CiAgICAgfTsKICAgICBteSAkaXNTZXF1ZW5jZU9y RnJvemVuQXJyYXlQYXJhbWV0ZXIgPSBzdWIgewotICAgICAgICBteSAoJHR5cGUsICRvcHRpb25h bGl0eSwgJGlzTnVsbGFibGUpID0gQF87Ci0gICAgICAgIHJldHVybiAkY29kZUdlbmVyYXRvci0+ SXNTZXF1ZW5jZU9yRnJvemVuQXJyYXlUeXBlKCR0eXBlKTsKKyAgICAgICAgbXkgKCRpZGxUeXBl LCAkb3B0aW9uYWxpdHkpID0gQF87CisgICAgICAgIHJldHVybiAkY29kZUdlbmVyYXRvci0+SXNT ZXF1ZW5jZU9yRnJvemVuQXJyYXlUeXBlKCRpZGxUeXBlLT5uYW1lKTsKICAgICB9OwogICAgIG15 ICRpc0RpY3Rpb25hcnlPck9iamVjdE9yQ2FsbGJhY2tJbnRlcmZhY2VQYXJhbWV0ZXIgPSBzdWIg ewotICAgICAgICBteSAoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUpID0gQF87Ci0g ICAgICAgIHJldHVybiAxIGlmICYkaXNEaWN0aW9uYXJ5UGFyYW1ldGVyKCR0eXBlLCAkb3B0aW9u YWxpdHksICRpc051bGxhYmxlKTsKLSAgICAgICAgcmV0dXJuIDEgaWYgJHR5cGUgZXEgIm9iamVj dCI7Ci0gICAgICAgIHJldHVybiAxIGlmICRjb2RlR2VuZXJhdG9yLT5Jc0NhbGxiYWNrSW50ZXJm YWNlKCR0eXBlKSAmJiAhJGNvZGVHZW5lcmF0b3ItPklzRnVuY3Rpb25Pbmx5Q2FsbGJhY2tJbnRl cmZhY2UoJHR5cGUpOworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBAXzsK KyAgICAgICAgcmV0dXJuIDEgaWYgJiRpc0RpY3Rpb25hcnlQYXJhbWV0ZXIoJGlkbFR5cGUsICRv cHRpb25hbGl0eSk7CisgICAgICAgIHJldHVybiAxIGlmICRpZGxUeXBlLT5uYW1lIGVxICJvYmpl Y3QiOworICAgICAgICByZXR1cm4gMSBpZiAkY29kZUdlbmVyYXRvci0+SXNDYWxsYmFja0ludGVy ZmFjZSgkaWRsVHlwZS0+bmFtZSkgJiYgISRjb2RlR2VuZXJhdG9yLT5Jc0Z1bmN0aW9uT25seUNh bGxiYWNrSW50ZXJmYWNlKCRpZGxUeXBlLT5uYW1lKTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAg fTsKICAgICBteSAkaXNCb29sZWFuUGFyYW1ldGVyID0gc3ViIHsKLSAgICAgICAgbXkgKCR0eXBl LCAkb3B0aW9uYWxpdHksICRpc051bGxhYmxlKSA9IEBfOwotICAgICAgICByZXR1cm4gJHR5cGUg ZXEgImJvb2xlYW4iOworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBAXzsK KyAgICAgICAgcmV0dXJuICRpZGxUeXBlLT5uYW1lIGVxICJib29sZWFuIjsKICAgICB9OwogICAg IG15ICRpc051bWVyaWNQYXJhbWV0ZXIgPSBzdWIgewotICAgICAgICBteSAoJHR5cGUsICRvcHRp b25hbGl0eSwgJGlzTnVsbGFibGUpID0gQF87Ci0gICAgICAgIHJldHVybiAkY29kZUdlbmVyYXRv ci0+SXNOdW1lcmljVHlwZSgkdHlwZSk7CisgICAgICAgIG15ICgkaWRsVHlwZSwgJG9wdGlvbmFs aXR5KSA9IEBfOworICAgICAgICByZXR1cm4gJGNvZGVHZW5lcmF0b3ItPklzTnVtZXJpY1R5cGUo JGlkbFR5cGUtPm5hbWUpOwogICAgIH07CiAgICAgbXkgJGlzU3RyaW5nT3JFbnVtUGFyYW1ldGVy ID0gc3ViIHsKLSAgICAgICAgbXkgKCR0eXBlLCAkb3B0aW9uYWxpdHksICRpc051bGxhYmxlKSA9 IEBfOwotICAgICAgICByZXR1cm4gJGNvZGVHZW5lcmF0b3ItPklzU3RyaW5nT3JFbnVtVHlwZSgk dHlwZSk7CisgICAgICAgIG15ICgkaWRsVHlwZSwgJG9wdGlvbmFsaXR5KSA9IEBfOworICAgICAg ICByZXR1cm4gJGNvZGVHZW5lcmF0b3ItPklzU3RyaW5nT3JFbnVtVHlwZSgkaWRsVHlwZS0+bmFt ZSk7CiAgICAgfTsKICAgICBteSAkaXNBbnlQYXJhbWV0ZXIgPSBzdWIgewotICAgICAgICBteSAo JHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUpID0gQF87Ci0gICAgICAgIHJldHVybiAk dHlwZSBlcSAiYW55IjsKKyAgICAgICAgbXkgKCRpZGxUeXBlLCAkb3B0aW9uYWxpdHkpID0gQF87 CisgICAgICAgIHJldHVybiAkaWRsVHlwZS0+bmFtZSBlcSAiYW55IjsKICAgICB9OwogCiAgICAg bXkgJG1heEFyZ0NvdW50ID0gTGVuZ3RoT2ZMb25nZXN0RnVuY3Rpb25QYXJhbWV0ZXJMaXN0KCRm dW5jdGlvbi0+e292ZXJsb2Fkc30pOwpAQCAtMjE0MSw3ICsyMTQ0LDggQEAgRU5ECiAKICAgICAg ICAgICAgIGZvciBteSAkdHVwbGUgKEB7JFN9KSB7CiAgICAgICAgICAgICAgICAgbXkgJG92ZXJs b2FkID0gQHskdHVwbGV9WzBdOwotICAgICAgICAgICAgICAgIG15ICR0eXBlID0gU3RyaXBOdWxs YWJsZShAe0B7JHR1cGxlfVsxXX1bJGRdKTsKKyAgICAgICAgICAgICAgICBteSAkaWRsVHlwZSA9 IEB7QHskdHVwbGV9WzFdfVskZF07CisgICAgICAgICAgICAgICAgbXkgJHR5cGUgPSAkaWRsVHlw ZS0+bmFtZTsKICAgICAgICAgICAgICAgICBpZiAoJGNvZGVHZW5lcmF0b3ItPklzV3JhcHBlclR5 cGUoJHR5cGUpIHx8ICRjb2RlR2VuZXJhdG9yLT5Jc1R5cGVkQXJyYXlUeXBlKCR0eXBlKSkgewog ICAgICAgICAgICAgICAgICAgICBpZiAoJHR5cGUgZXEgIkRPTVdpbmRvdyIpIHsKICAgICAgICAg ICAgICAgICAgICAgICAgIEFkZFRvSW1wbEluY2x1ZGVzKCJKU0RPTVdpbmRvd1NoZWxsLmgiKTsK 292288 2016-10-20 17:07:58 -0700 2016-10-20 18:29:47 -0700 Patch bug-163767-20161020170420.patch text/plain 11232 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRiNTUyZGZjMGRjYTBh ODA3YTAxZDM4M2VlNWExNjViNWFiNjU2YS4uNjdiN2U4ZTJiODI0MjE1MDkwNjZlNmQ3MjU1OTU4 Nzk0N2UwNzdlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE2LTEwLTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0JpbmRpbmdzXSBTdGFydCB1 c2luZyBzaWduYXR1cmUtPmlkbFR5cGUgaW5zdGVhZCBvZiBzaWduYXR1cmUtPnR5cGUgaW4gdGhl IG92ZXJsb2FkIHJlc29sdXRpb24gY29kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTYzNzY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU3RhcnQgdXNpbmcgc2lnbmF0dXJlLT5pZGxUeXBlIGluc3RlYWQg b2Ygc2lnbmF0dXJlLT50eXBlIGluIHRoZSBvdmVybG9hZCByZXNvbHV0aW9uIGNvZGUKKyAgICAg ICAgdG8gcHJlcGFyZSBmb3IgdW5pb24gdHlwZSBzdXBwb3J0LgorCisgICAgICAgICogYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG06CisgICAgICAgIChDb21wdXRlRWZmZWN0aXZl T3ZlcmxvYWRTZXQpOgorICAgICAgICAoQXJlVHlwZXNEaXN0aW5ndWlzaGFibGVGb3JPdmVybG9h ZFJlc29sdXRpb24pOgorICAgICAgICAoR2V0RGlzdGluZ3Vpc2hpbmdBcmd1bWVudEluZGV4KToK KyAgICAgICAgKEdldE92ZXJsb2FkVGhhdE1hdGNoZXMpOgorICAgICAgICAoR2VuZXJhdGVPdmVy bG9hZGVkRnVuY3Rpb25PckNvbnN0cnVjdG9yKToKKwogMjAxNi0xMC0xOSAgTXlsZXMgQy4gTWF4 ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10gW2lPU10gRGlz YWJsZSB2YXJpYXRpb24gZm9udHMgb24gbWFjT1MgRWwgQ2FwaXRhbiBhbmQgaU9TIDkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBt IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KaW5k ZXggODBmNTI1NTVjZDEyN2IyZTBkNGZhYWIwZTRkNzFjOGE1YzI5OGI4Ni4uNDc2YTk2NjNkY2Qy MjVkYzYxYzkyZmVjMTUyMzY1ZjFjNGExYWUzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KKysrIGIvU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KQEAgLTE5MTQsNyArMTkxNCw3IEBA IHN1YiBDb21wdXRlRWZmZWN0aXZlT3ZlcmxvYWRTZXQKICAgICAgICAgbXkgQG87CiAgICAgICAg IG15ICRpc1ZhcmlhZGljID0gMDsKICAgICAgICAgZm9yZWFjaCBteSAkcGFyYW1ldGVyIChAeyRv dmVybG9hZC0+cGFyYW1ldGVyc30pIHsKLSAgICAgICAgICAgIHB1c2goQHQsICRwYXJhbWV0ZXIt PmlzTnVsbGFibGUgPyAkcGFyYW1ldGVyLT50eXBlIC4gIj8iIDogJHBhcmFtZXRlci0+dHlwZSk7 CisgICAgICAgICAgICBwdXNoKEB0LCAkcGFyYW1ldGVyLT5pZGxUeXBlKTsKICAgICAgICAgICAg IGlmICgkcGFyYW1ldGVyLT5pc09wdGlvbmFsKSB7CiAgICAgICAgICAgICAgICAgcHVzaChAbywg Im9wdGlvbmFsIik7CiAgICAgICAgICAgICB9IGVsc2lmICgkcGFyYW1ldGVyLT5pc1ZhcmlhZGlj KSB7CkBAIC0xOTUwLDcgKzE5NTAsNyBAQCBzdWIgQ29tcHV0ZUVmZmVjdGl2ZU92ZXJsb2FkU2V0 CiAjIGh0dHA6Ly9oZXljYW0uZ2l0aHViLmlvL3dlYmlkbC8jZGZuLWRpc3Rpbmd1aXNoYWJsZQog c3ViIEFyZVR5cGVzRGlzdGluZ3Vpc2hhYmxlRm9yT3ZlcmxvYWRSZXNvbHV0aW9uCiB7Ci0gICAg bXkgKCR0eXBlQSwgJHR5cGVCKSA9IEBfOworICAgIG15ICgkaWRsVHlwZUEsICRpZGxUeXBlQikg PSBAXzsKIAogICAgIG15ICRpc0RpY3Rpb25hcnkgPSBzdWIgewogICAgICAgICBteSAkdHlwZSA9 IHNoaWZ0OwpAQCAtMTk2MCwyMiArMTk2MCwyNiBAQCBzdWIgQXJlVHlwZXNEaXN0aW5ndWlzaGFi bGVGb3JPdmVybG9hZFJlc29sdXRpb24KICAgICAgICAgbXkgJHR5cGUgPSBzaGlmdDsKICAgICAg ICAgcmV0dXJuICRjb2RlR2VuZXJhdG9yLT5Jc0Z1bmN0aW9uT25seUNhbGxiYWNrSW50ZXJmYWNl KCR0eXBlKSB8fCAmJGlzRGljdGlvbmFyeSgkdHlwZSk7CiAgICAgfTsKKyAgICAKKyAgICAjIEZJ WE1FOiBBZGQgc3VwcG9ydCBmb3IgdW5pb24gdHlwZXMuCisgICAgIyBpZGxUeXBlQSBhbmQgaWRs VHlwZUIgIGFyZSBkaXN0aW5ndWlzaGFibGUgaWY6CisgICAgIyAtIE9uZSB0eXBlIGlzIGEgdW5p b24gdHlwZSBvciBudWxsYWJsZSB1bmlvbiB0eXBlLCB0aGUgb3RoZXIgaXMgbmVpdGhlciBhIHVu aW9uIHR5cGUgbm9yIGEgbnVsbGFibGUKKyAgICAjICAgdW5pb24gdHlwZSwgYW5kIGVhY2ggbWVt YmVyIHR5cGUgb2YgdGhlIGZpcnN0IGlzIGRpc3Rpbmd1aXNoYWJsZSB3aXRoIHRoZSBzZWNvbmQu CisgICAgIyAtIEJvdGggdHlwZXMgYXJlIGVpdGhlciBhIHVuaW9uIHR5cGUgb3IgbnVsbGFibGUg dW5pb24gdHlwZSwgYW5kIGVhY2ggbWVtYmVyIHR5cGUgb2YgdGhlIG9uZSBpcworICAgICMgICBk aXN0aW5ndWlzaGFibGUgd2l0aCBlYWNoIG1lbWJlciB0eXBlIG9mIHRoZSBvdGhlci4KIAogICAg ICMgRklYTUU6IFRoZSBXZWJJREwgbWFuZGF0ZXMgdGhpcyBidXQgdGhpcyBjdXJyZW50bHkgZG9l cyBub3Qgd29yayBiZWNhdXNlIHNvbWUgb2Ygb3VyIElETCBpcyB3cm9uZy4KLSAgICAjIHJldHVy biAwIGlmIElzTnVsbGFibGVUeXBlKCR0eXBlQSkgJiYgSXNOdWxsYWJsZVR5cGUoJHR5cGVCKTsK LQotICAgICR0eXBlQSA9IFN0cmlwTnVsbGFibGUoJHR5cGVBKTsKLSAgICAkdHlwZUIgPSBTdHJp cE51bGxhYmxlKCR0eXBlQik7Ci0KLSAgICByZXR1cm4gMCBpZiAkdHlwZUEgZXEgJHR5cGVCOwot ICAgIHJldHVybiAwIGlmICR0eXBlQSBlcSAib2JqZWN0IiBvciAkdHlwZUIgZXEgIm9iamVjdCI7 Ci0gICAgcmV0dXJuIDAgaWYgJGNvZGVHZW5lcmF0b3ItPklzTnVtZXJpY1R5cGUoJHR5cGVBKSAm JiAkY29kZUdlbmVyYXRvci0+SXNOdW1lcmljVHlwZSgkdHlwZUIpOwotICAgIHJldHVybiAwIGlm ICRjb2RlR2VuZXJhdG9yLT5Jc1N0cmluZ09yRW51bVR5cGUoJHR5cGVBKSAmJiAkY29kZUdlbmVy YXRvci0+SXNTdHJpbmdPckVudW1UeXBlKCR0eXBlQik7Ci0gICAgcmV0dXJuIDAgaWYgJiRpc0Rp Y3Rpb25hcnkoJHR5cGVBKSAmJiAmJGlzRGljdGlvbmFyeSgkdHlwZUIpOwotICAgIHJldHVybiAw IGlmICRjb2RlR2VuZXJhdG9yLT5Jc0NhbGxiYWNrSW50ZXJmYWNlKCR0eXBlQSkgJiYgJGNvZGVH ZW5lcmF0b3ItPklzQ2FsbGJhY2tJbnRlcmZhY2UoJHR5cGVCKTsKLSAgICByZXR1cm4gMCBpZiAm JGlzQ2FsbGJhY2tGdW5jdGlvbk9yRGljdGlvbmFyeSgkdHlwZUEpICYmICYkaXNDYWxsYmFja0Z1 bmN0aW9uT3JEaWN0aW9uYXJ5KCR0eXBlQik7Ci0gICAgcmV0dXJuIDAgaWYgJGNvZGVHZW5lcmF0 b3ItPklzU2VxdWVuY2VPckZyb3plbkFycmF5VHlwZSgkdHlwZUEpICYmICRjb2RlR2VuZXJhdG9y LT5Jc1NlcXVlbmNlT3JGcm96ZW5BcnJheVR5cGUoJHR5cGVCKTsKLSAgICAjIEZJWE1FOiByZXR1 cm4gMCBpZiB0eXBlQSBhbmQgdHlwZUIgYXJlIGJvdGggZXhjZXB0aW9uIHR5cGVzLgorICAgICMg cmV0dXJuIDAgaWYgJGlkbFR5cGVBLT5pc051bGxhYmxlICYmICRpZGxUeXBlQi0+aXNOdWxsYWJs ZTsKKworICAgIHJldHVybiAwIGlmICRpZGxUeXBlQS0+bmFtZSBlcSAkaWRsVHlwZUItPm5hbWU7 CisgICAgcmV0dXJuIDAgaWYgJGlkbFR5cGVBLT5uYW1lIGVxICJvYmplY3QiIG9yICRpZGxUeXBl Qi0+bmFtZSBlcSAib2JqZWN0IjsKKyAgICByZXR1cm4gMCBpZiAkY29kZUdlbmVyYXRvci0+SXNO dW1lcmljVHlwZSgkaWRsVHlwZUEtPm5hbWUpICYmICRjb2RlR2VuZXJhdG9yLT5Jc051bWVyaWNU eXBlKCRpZGxUeXBlQi0+bmFtZSk7CisgICAgcmV0dXJuIDAgaWYgJGNvZGVHZW5lcmF0b3ItPklz U3RyaW5nT3JFbnVtVHlwZSgkaWRsVHlwZUEtPm5hbWUpICYmICRjb2RlR2VuZXJhdG9yLT5Jc1N0 cmluZ09yRW51bVR5cGUoJGlkbFR5cGVCLT5uYW1lKTsKKyAgICByZXR1cm4gMCBpZiAmJGlzRGlj dGlvbmFyeSgkaWRsVHlwZUEtPm5hbWUpICYmICYkaXNEaWN0aW9uYXJ5KCRpZGxUeXBlQi0+bmFt ZSk7CisgICAgcmV0dXJuIDAgaWYgJGNvZGVHZW5lcmF0b3ItPklzQ2FsbGJhY2tJbnRlcmZhY2Uo JGlkbFR5cGVBLT5uYW1lKSAmJiAkY29kZUdlbmVyYXRvci0+SXNDYWxsYmFja0ludGVyZmFjZSgk aWRsVHlwZUItPm5hbWUpOworICAgIHJldHVybiAwIGlmICYkaXNDYWxsYmFja0Z1bmN0aW9uT3JE aWN0aW9uYXJ5KCRpZGxUeXBlQS0+bmFtZSkgJiYgJiRpc0NhbGxiYWNrRnVuY3Rpb25PckRpY3Rp b25hcnkoJGlkbFR5cGVCLT5uYW1lKTsKKyAgICByZXR1cm4gMCBpZiAkY29kZUdlbmVyYXRvci0+ SXNTZXF1ZW5jZU9yRnJvemVuQXJyYXlUeXBlKCRpZGxUeXBlQS0+bmFtZSkgJiYgJGNvZGVHZW5l cmF0b3ItPklzU2VxdWVuY2VPckZyb3plbkFycmF5VHlwZSgkaWRsVHlwZUItPm5hbWUpOworICAg ICMgRklYTUU6IHJldHVybiAwIGlmICRpZGxUeXBlQSBhbmQgJGlkbFR5cGVCIGFyZSBib3RoIGV4 Y2VwdGlvbiB0eXBlcy4KICAgICByZXR1cm4gMTsKIH0KIApAQCAtMTk4OCwxMiArMTk5MiwxMiBA QCBzdWIgR2V0RGlzdGluZ3Vpc2hpbmdBcmd1bWVudEluZGV4CiAgICAgbXkgKCRmdW5jdGlvbiwg JFMpID0gQF87CiAKICAgICAjIEZJWE1FOiBDb25zaWRlciBhbGwgdGhlIHR1cGxlcywgbm90IGp1 c3QgdGhlIDIgZmlyc3Qgb25lcz8KLSAgICBteSAkZmlyc3RUdXBsZVR5cGVzID0gQHtAeyRTfVsw XX1bMV07Ci0gICAgbXkgJHNlY29uZFR1cGxlVHlwZXMgPSBAe0B7JFN9WzFdfVsxXTsKLSAgICBm b3IgKG15ICRpbmRleCA9IDA7ICRpbmRleCA8IHNjYWxhcihAJGZpcnN0VHVwbGVUeXBlcyk7ICRp bmRleCsrKSB7Ci0gICAgICAgIHJldHVybiAkaW5kZXggaWYgQXJlVHlwZXNEaXN0aW5ndWlzaGFi bGVGb3JPdmVybG9hZFJlc29sdXRpb24oQHskZmlyc3RUdXBsZVR5cGVzfVskaW5kZXhdLCBAeyRz ZWNvbmRUdXBsZVR5cGVzfVskaW5kZXhdKTsKKyAgICBteSAkZmlyc3RUdXBsZUlETFR5cGVzID0g QHtAeyRTfVswXX1bMV07CisgICAgbXkgJHNlY29uZFR1cGxlSURMVHlwZXMgPSBAe0B7JFN9WzFd fVsxXTsKKyAgICBmb3IgKG15ICRpbmRleCA9IDA7ICRpbmRleCA8IHNjYWxhcihAJGZpcnN0VHVw bGVJRExUeXBlcyk7ICRpbmRleCsrKSB7CisgICAgICAgIHJldHVybiAkaW5kZXggaWYgQXJlVHlw ZXNEaXN0aW5ndWlzaGFibGVGb3JPdmVybG9hZFJlc29sdXRpb24oQHskZmlyc3RUdXBsZUlETFR5 cGVzfVskaW5kZXhdLCBAeyRzZWNvbmRUdXBsZUlETFR5cGVzfVskaW5kZXhdKTsKICAgICB9Ci0g ICAgZGllICJVbmRpc3Rpbmd1aXNoYWJsZSBvdmVybG9hZHMgZm9yIG9wZXJhdGlvbiAiIC4gJGZ1 bmN0aW9uLT5zaWduYXR1cmUtPm5hbWUgLiAiIHdpdGggbGVuZ3RoOiAiIC4gc2NhbGFyKEAkZmly c3RUdXBsZVR5cGVzKTsKKyAgICBkaWUgIlVuZGlzdGluZ3Vpc2hhYmxlIG92ZXJsb2FkcyBmb3Ig b3BlcmF0aW9uICIgLiAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+bmFtZSAuICIgd2l0aCBsZW5ndGg6 ICIgLiBzY2FsYXIoQCRmaXJzdFR1cGxlSURMVHlwZXMpOwogfQogCiBzdWIgR2V0T3ZlcmxvYWRU aGF0TWF0Y2hlcwpAQCAtMjAwMSwxMCArMjAwNSw5IEBAIHN1YiBHZXRPdmVybG9hZFRoYXRNYXRj aGVzCiAgICAgbXkgKCRTLCAkcGFyYW1ldGVySW5kZXgsICRtYXRjaGVzKSA9IEBfOwogCiAgICAg Zm9yIG15ICR0dXBsZSAoQHskU30pIHsKLSAgICAgICAgbXkgJHR5cGUgPSBAe0B7JHR1cGxlfVsx XX1bJHBhcmFtZXRlckluZGV4XTsKKyAgICAgICAgbXkgJGlkbFR5cGUgPSBAe0B7JHR1cGxlfVsx XX1bJHBhcmFtZXRlckluZGV4XTsKICAgICAgICAgbXkgJG9wdGlvbmFsaXR5ID0gQHtAeyR0dXBs ZX1bMl19WyRwYXJhbWV0ZXJJbmRleF07Ci0gICAgICAgIG15ICRpc051bGxhYmxlID0gSXNOdWxs YWJsZVR5cGUoJHR5cGUpOwotICAgICAgICByZXR1cm4gQHskdHVwbGV9WzBdIGlmICRtYXRjaGVz LT4oU3RyaXBOdWxsYWJsZSgkdHlwZSksICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUpOworICAg ICAgICByZXR1cm4gQHskdHVwbGV9WzBdIGlmICRtYXRjaGVzLT4oJGlkbFR5cGUsICRvcHRpb25h bGl0eSk7CiAgICAgfQogfQogCkBAIC0yMDUwLDYwICsyMDUzLDYwIEBAIHN1YiBHZW5lcmF0ZU92 ZXJsb2FkZWRGdW5jdGlvbk9yQ29uc3RydWN0b3IKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIjZW5kaWZcbiIpIGlmICRjb25kaXRpb25hbFN0cmluZzsKICAgICB9OwogICAgIG15ICRpc09w dGlvbmFsUGFyYW1ldGVyID0gc3ViIHsKLSAgICAgICAgbXkgKCR0eXBlLCAkb3B0aW9uYWxpdHks ICRpc051bGxhYmxlKSA9IEBfOworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkg PSBAXzsKICAgICAgICAgcmV0dXJuICRvcHRpb25hbGl0eSBlcSAib3B0aW9uYWwiOwogICAgIH07 CiAgICAgbXkgJGlzRGljdGlvbmFyeVBhcmFtZXRlciA9IHN1YiB7Ci0gICAgICAgIG15ICgkdHlw ZSwgJG9wdGlvbmFsaXR5LCAkaXNOdWxsYWJsZSkgPSBAXzsKLSAgICAgICAgcmV0dXJuICR0eXBl IGVxICJEaWN0aW9uYXJ5IiB8fCAkY29kZUdlbmVyYXRvci0+SXNEaWN0aW9uYXJ5VHlwZSgkdHlw ZSk7CisgICAgICAgIG15ICgkaWRsVHlwZSwgJG9wdGlvbmFsaXR5KSA9IEBfOworICAgICAgICBy ZXR1cm4gJGlkbFR5cGUtPm5hbWUgZXEgIkRpY3Rpb25hcnkiIHx8ICRjb2RlR2VuZXJhdG9yLT5J c0RpY3Rpb25hcnlUeXBlKCRpZGxUeXBlLT5uYW1lKTsKICAgICB9OwogICAgIG15ICRpc051bGxh YmxlT3JEaWN0aW9uYXJ5UGFyYW1ldGVyID0gc3ViIHsKLSAgICAgICAgbXkgKCR0eXBlLCAkb3B0 aW9uYWxpdHksICRpc051bGxhYmxlKSA9IEBfOwotICAgICAgICByZXR1cm4gJGlzTnVsbGFibGUg fHwgJiRpc0RpY3Rpb25hcnlQYXJhbWV0ZXIoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFi bGUpOworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBAXzsKKyAgICAgICAg cmV0dXJuICRpZGxUeXBlLT5pc051bGxhYmxlIHx8ICYkaXNEaWN0aW9uYXJ5UGFyYW1ldGVyKCRp ZGxUeXBlLCAkb3B0aW9uYWxpdHkpOwogICAgIH07CiAgICAgbXkgJGlzUmVnRXhwT3JPYmplY3RQ YXJhbWV0ZXIgPSBzdWIgewotICAgICAgICBteSAoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVs bGFibGUpID0gQF87Ci0gICAgICAgIHJldHVybiAkdHlwZSBlcSAiUmVnRXhwIiB8fCAkdHlwZSBl cSAib2JqZWN0IjsKKyAgICAgICAgbXkgKCRpZGxUeXBlLCAkb3B0aW9uYWxpdHkpID0gQF87Cisg ICAgICAgIHJldHVybiAkaWRsVHlwZS0+bmFtZSBlcSAiUmVnRXhwIiB8fCAkaWRsVHlwZS0+bmFt ZSBlcSAib2JqZWN0IjsKICAgICB9OwogICAgIG15ICRpc09iamVjdE9yRXJyb3JQYXJhbWV0ZXIg PSBzdWIgewotICAgICAgICBteSAoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUpID0g QF87Ci0gICAgICAgIHJldHVybiAkdHlwZSBlcSAib2JqZWN0IiB8fCAkdHlwZSBlcSAiRXJyb3Ii OworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBAXzsKKyAgICAgICAgcmV0 dXJuICRpZGxUeXBlLT5uYW1lIGVxICJvYmplY3QiIHx8ICRpZGxUeXBlLT5uYW1lIGVxICJFcnJv ciI7CiAgICAgfTsKICAgICBteSAkaXNPYmplY3RPckVycm9yT3JET01FeGNlcHRpb25QYXJhbWV0 ZXIgPSBzdWIgewotICAgICAgICBteSAoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUp ID0gQF87Ci0gICAgICAgIHJldHVybiAxIGlmICYkaXNPYmplY3RPckVycm9yUGFyYW1ldGVyKCR0 eXBlLCAkb3B0aW9uYWxpdHksICRpc051bGxhYmxlKTsKLSAgICAgICAgcmV0dXJuICR0eXBlIGVx ICJET01FeGNlcHRpb24iOworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBA XzsKKyAgICAgICAgcmV0dXJuIDEgaWYgJiRpc09iamVjdE9yRXJyb3JQYXJhbWV0ZXIoJGlkbFR5 cGUsICRvcHRpb25hbGl0eSk7CisgICAgICAgIHJldHVybiAkaWRsVHlwZS0+bmFtZSBlcSAiRE9N RXhjZXB0aW9uIjsKICAgICB9OwogICAgIG15ICRpc09iamVjdE9yQ2FsbGJhY2tGdW5jdGlvblBh cmFtZXRlciA9IHN1YiB7Ci0gICAgICAgIG15ICgkdHlwZSwgJG9wdGlvbmFsaXR5LCAkaXNOdWxs YWJsZSkgPSBAXzsKLSAgICAgICAgcmV0dXJuICR0eXBlIGVxICJvYmplY3QiIHx8ICRjb2RlR2Vu ZXJhdG9yLT5Jc0Z1bmN0aW9uT25seUNhbGxiYWNrSW50ZXJmYWNlKCR0eXBlKTsKKyAgICAgICAg bXkgKCRpZGxUeXBlLCAkb3B0aW9uYWxpdHkpID0gQF87CisgICAgICAgIHJldHVybiAkaWRsVHlw ZS0+bmFtZSBlcSAib2JqZWN0IiB8fCAkY29kZUdlbmVyYXRvci0+SXNGdW5jdGlvbk9ubHlDYWxs YmFja0ludGVyZmFjZSgkaWRsVHlwZS0+bmFtZSk7CiAgICAgfTsKICAgICBteSAkaXNTZXF1ZW5j ZU9yRnJvemVuQXJyYXlQYXJhbWV0ZXIgPSBzdWIgewotICAgICAgICBteSAoJHR5cGUsICRvcHRp b25hbGl0eSwgJGlzTnVsbGFibGUpID0gQF87Ci0gICAgICAgIHJldHVybiAkY29kZUdlbmVyYXRv ci0+SXNTZXF1ZW5jZU9yRnJvemVuQXJyYXlUeXBlKCR0eXBlKTsKKyAgICAgICAgbXkgKCRpZGxU eXBlLCAkb3B0aW9uYWxpdHkpID0gQF87CisgICAgICAgIHJldHVybiAkY29kZUdlbmVyYXRvci0+ SXNTZXF1ZW5jZU9yRnJvemVuQXJyYXlUeXBlKCRpZGxUeXBlLT5uYW1lKTsKICAgICB9OwogICAg IG15ICRpc0RpY3Rpb25hcnlPck9iamVjdE9yQ2FsbGJhY2tJbnRlcmZhY2VQYXJhbWV0ZXIgPSBz dWIgewotICAgICAgICBteSAoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUpID0gQF87 Ci0gICAgICAgIHJldHVybiAxIGlmICYkaXNEaWN0aW9uYXJ5UGFyYW1ldGVyKCR0eXBlLCAkb3B0 aW9uYWxpdHksICRpc051bGxhYmxlKTsKLSAgICAgICAgcmV0dXJuIDEgaWYgJHR5cGUgZXEgIm9i amVjdCI7Ci0gICAgICAgIHJldHVybiAxIGlmICRjb2RlR2VuZXJhdG9yLT5Jc0NhbGxiYWNrSW50 ZXJmYWNlKCR0eXBlKSAmJiAhJGNvZGVHZW5lcmF0b3ItPklzRnVuY3Rpb25Pbmx5Q2FsbGJhY2tJ bnRlcmZhY2UoJHR5cGUpOworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBA XzsKKyAgICAgICAgcmV0dXJuIDEgaWYgJiRpc0RpY3Rpb25hcnlQYXJhbWV0ZXIoJGlkbFR5cGUs ICRvcHRpb25hbGl0eSk7CisgICAgICAgIHJldHVybiAxIGlmICRpZGxUeXBlLT5uYW1lIGVxICJv YmplY3QiOworICAgICAgICByZXR1cm4gMSBpZiAkY29kZUdlbmVyYXRvci0+SXNDYWxsYmFja0lu dGVyZmFjZSgkaWRsVHlwZS0+bmFtZSkgJiYgISRjb2RlR2VuZXJhdG9yLT5Jc0Z1bmN0aW9uT25s eUNhbGxiYWNrSW50ZXJmYWNlKCRpZGxUeXBlLT5uYW1lKTsKICAgICAgICAgcmV0dXJuIDA7CiAg ICAgfTsKICAgICBteSAkaXNCb29sZWFuUGFyYW1ldGVyID0gc3ViIHsKLSAgICAgICAgbXkgKCR0 eXBlLCAkb3B0aW9uYWxpdHksICRpc051bGxhYmxlKSA9IEBfOwotICAgICAgICByZXR1cm4gJHR5 cGUgZXEgImJvb2xlYW4iOworICAgICAgICBteSAoJGlkbFR5cGUsICRvcHRpb25hbGl0eSkgPSBA XzsKKyAgICAgICAgcmV0dXJuICRpZGxUeXBlLT5uYW1lIGVxICJib29sZWFuIjsKICAgICB9Owog ICAgIG15ICRpc051bWVyaWNQYXJhbWV0ZXIgPSBzdWIgewotICAgICAgICBteSAoJHR5cGUsICRv cHRpb25hbGl0eSwgJGlzTnVsbGFibGUpID0gQF87Ci0gICAgICAgIHJldHVybiAkY29kZUdlbmVy YXRvci0+SXNOdW1lcmljVHlwZSgkdHlwZSk7CisgICAgICAgIG15ICgkaWRsVHlwZSwgJG9wdGlv bmFsaXR5KSA9IEBfOworICAgICAgICByZXR1cm4gJGNvZGVHZW5lcmF0b3ItPklzTnVtZXJpY1R5 cGUoJGlkbFR5cGUtPm5hbWUpOwogICAgIH07CiAgICAgbXkgJGlzU3RyaW5nT3JFbnVtUGFyYW1l dGVyID0gc3ViIHsKLSAgICAgICAgbXkgKCR0eXBlLCAkb3B0aW9uYWxpdHksICRpc051bGxhYmxl KSA9IEBfOwotICAgICAgICByZXR1cm4gJGNvZGVHZW5lcmF0b3ItPklzU3RyaW5nT3JFbnVtVHlw ZSgkdHlwZSk7CisgICAgICAgIG15ICgkaWRsVHlwZSwgJG9wdGlvbmFsaXR5KSA9IEBfOworICAg ICAgICByZXR1cm4gJGNvZGVHZW5lcmF0b3ItPklzU3RyaW5nT3JFbnVtVHlwZSgkaWRsVHlwZS0+ bmFtZSk7CiAgICAgfTsKICAgICBteSAkaXNBbnlQYXJhbWV0ZXIgPSBzdWIgewotICAgICAgICBt eSAoJHR5cGUsICRvcHRpb25hbGl0eSwgJGlzTnVsbGFibGUpID0gQF87Ci0gICAgICAgIHJldHVy biAkdHlwZSBlcSAiYW55IjsKKyAgICAgICAgbXkgKCRpZGxUeXBlLCAkb3B0aW9uYWxpdHkpID0g QF87CisgICAgICAgIHJldHVybiAkaWRsVHlwZS0+bmFtZSBlcSAiYW55IjsKICAgICB9OwogCiAg ICAgbXkgJG1heEFyZ0NvdW50ID0gTGVuZ3RoT2ZMb25nZXN0RnVuY3Rpb25QYXJhbWV0ZXJMaXN0 KCRmdW5jdGlvbi0+e292ZXJsb2Fkc30pOwpAQCAtMjE0MSw3ICsyMTQ0LDggQEAgRU5ECiAKICAg ICAgICAgICAgIGZvciBteSAkdHVwbGUgKEB7JFN9KSB7CiAgICAgICAgICAgICAgICAgbXkgJG92 ZXJsb2FkID0gQHskdHVwbGV9WzBdOwotICAgICAgICAgICAgICAgIG15ICR0eXBlID0gU3RyaXBO dWxsYWJsZShAe0B7JHR1cGxlfVsxXX1bJGRdKTsKKyAgICAgICAgICAgICAgICBteSAkaWRsVHlw ZSA9IEB7QHskdHVwbGV9WzFdfVskZF07CisgICAgICAgICAgICAgICAgbXkgJHR5cGUgPSAkaWRs VHlwZS0+bmFtZTsKICAgICAgICAgICAgICAgICBpZiAoJGNvZGVHZW5lcmF0b3ItPklzV3JhcHBl clR5cGUoJHR5cGUpIHx8ICRjb2RlR2VuZXJhdG9yLT5Jc1R5cGVkQXJyYXlUeXBlKCR0eXBlKSkg ewogICAgICAgICAgICAgICAgICAgICBpZiAoJHR5cGUgZXEgIkRPTVdpbmRvdyIpIHsKICAgICAg ICAgICAgICAgICAgICAgICAgIEFkZFRvSW1wbEluY2x1ZGVzKCJKU0RPTVdpbmRvd1NoZWxsLmgi KTsK