138258 2014-10-31 13:59:07 -0700 Fix several warnings reported by clang static analyzer in WebCore 2014-10-31 16:25:06 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez benjamin buildbot calvaris commit-queue d-r eric.carlson esprehn+autocc fmalita glenn gyuyoung.kim jer.noble kangil.han kling kondapallykalyan mmaxfield pdr philipj rniwa schenney sergio oldest_to_newest 1045366 0 cdumez 2014-10-31 13:59:07 -0700 Fix several warnings reported by clang static analyzer in WebCore related to variable unnecessary assignments and scope. 1045370 1 240753 cdumez 2014-10-31 14:10:29 -0700 Created attachment 240753 Patch 1045412 2 240753 joepeck 2014-10-31 15:45:34 -0700 Comment on attachment 240753 Patch r=me 1045431 3 240753 commit-queue 2014-10-31 16:25:01 -0700 Comment on attachment 240753 Patch Clearing flags on attachment: 240753 Committed r175435: <http://trac.webkit.org/changeset/175435> 1045432 4 commit-queue 2014-10-31 16:25:06 -0700 All reviewed patches have been landed. Closing bug. 240753 2014-10-31 14:10:29 -0700 2014-10-31 16:25:01 -0700 Patch bug-138258-20141031141038.patch text/plain 8940 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Q0NTE5MmI0ODI2Y2Uz OTIzYTQyYWU4YWI5OTM5ZTNkNjllNTU0ZC4uMzlkNmI0ODQ5YTgzMWM4Y2M5ZGY1MjIwNjQ3OGVj NzBkZmI5NzY3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTEwLTMxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHNldmVyYWwgd2Fybmlu Z3MgcmVwb3J0ZWQgYnkgY2xhbmcgc3RhdGljIGFuYWx5emVyIGluIFdlYkNvcmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODI1OAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBzZXZlcmFsIHdhcm5p bmdzIHJlcG9ydGVkIGJ5IGNsYW5nIHN0YXRpYyBhbmFseXplciBpbiBXZWJDb3JlCisgICAgICAg IHJlbGF0ZWQgdG8gdmFyaWFibGUgdW5uZWNlc3NhcnkgYXNzaWdubWVudHMgYW5kIHNjb3BlLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICog ZG9tL0NvbnRhaW5lck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVyTm9kZTo6 Z2V0VXBwZXJMZWZ0Q29ybmVyKToKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVRleHRFZGl0b3IuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yU3R5bGVUZXh0RWRpdG9yOjpyZXBsYWNlUHJvcGVydHkpOgor ICAgICAgICAqIHBhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Om9wZW5OZXdXaW5kb3cpOgorICAgICAgICAqIHBhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlTW91c2VFdmVudCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6 OmNvbXB1dGVJbmxpbmVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAgICAgKiByZW5kZXJp bmcvc3ZnL1NWR0lubGluZVRleHRCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHSW5saW5l VGV4dEJveDo6cGFpbnRTZWxlY3Rpb25CYWNrZ3JvdW5kKToKKwogMjAxNC0xMC0zMSAgQWtvcyBL aXNzICA8YWtpc3NAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIEZpeCB0eXBlIGNsYXNoIHdh cm5pbmcgaW4gc3VwcG9ydHNfZXJyb3IgcnVsZSBvZiBDU1NHcmFtbWFyLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0NvbnRhaW5lck5vZGUuY3BwCmluZGV4IDE0NzZmMjNhNDgxNWEzZWUzNzlkOWQ0Y2YzYmUzY2M3 NzE3N2VhY2YuLjExZmU5NmI3N2M5ZmMyNzg2MDY1NGZiOTI4MjZhZTY2MmY0ODhjMDEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAKQEAgLTgwOSw4ICs4MDksNiBAQCBib29sIENv bnRhaW5lck5vZGU6OmdldFVwcGVyTGVmdENvcm5lcihGbG9hdFBvaW50JiBwb2ludCkgY29uc3QK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIC8vIFdoYXQgaXMgdGhpcyBjb2RlIHJlYWxseSB0 cnlpbmcgdG8gZG8/CiAgICAgUmVuZGVyT2JqZWN0KiBvID0gcmVuZGVyZXIoKTsKLSAgICBSZW5k ZXJPYmplY3QqIHAgPSBvOwotCiAgICAgaWYgKCFvLT5pc0lubGluZSgpIHx8IG8tPmlzUmVwbGFj ZWQoKSkgewogICAgICAgICBwb2ludCA9IG8tPmxvY2FsVG9BYnNvbHV0ZShGbG9hdFBvaW50KCks IFVzZVRyYW5zZm9ybXMpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTgxOCw3ICs4MTYsNyBA QCBib29sIENvbnRhaW5lck5vZGU6OmdldFVwcGVyTGVmdENvcm5lcihGbG9hdFBvaW50JiBwb2lu dCkgY29uc3QKIAogICAgIC8vIGZpbmQgdGhlIG5leHQgdGV4dC9pbWFnZSBjaGlsZCwgdG8gZ2V0 IGEgcG9zaXRpb24KICAgICB3aGlsZSAobykgewotICAgICAgICBwID0gbzsKKyAgICAgICAgUmVu ZGVyT2JqZWN0KiBwID0gbzsKICAgICAgICAgaWYgKFJlbmRlck9iamVjdCogY2hpbGQgPSBvLT5m aXJzdENoaWxkU2xvdygpKQogICAgICAgICAgICAgbyA9IGNoaWxkOwogICAgICAgICBlbHNlIGlm IChvLT5uZXh0U2libGluZygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M TWVkaWFFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5j cHAKaW5kZXggZjRmNTI5YjY0OTIwYTZkNjQ0NTkwNTMzZWEwYTI2YzkyMDg0ZWRkYy4uM2IxMGU0 M2UwNjE3YmJiODMxM2UwZTEzODIzNmE0NWY0ZmE5YjZiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxNZWRpYUVsZW1lbnQuY3BwCkBAIC0zNzg1LDcgKzM3ODUsNyBAQCB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OnNldFNlbGVjdGVkVGV4dFRyYWNrKFRleHRUcmFjayogdHJhY2tUb1NlbGVjdCkK ICAgICBpZiAoIWNhcHRpb25QcmVmZXJlbmNlcykKICAgICAgICAgcmV0dXJuOwogCi0gICAgQ2Fw dGlvblVzZXJQcmVmZXJlbmNlczo6Q2FwdGlvbkRpc3BsYXlNb2RlIGRpc3BsYXlNb2RlID0gY2Fw dGlvblByZWZlcmVuY2VzLT5jYXB0aW9uRGlzcGxheU1vZGUoKTsKKyAgICBDYXB0aW9uVXNlclBy ZWZlcmVuY2VzOjpDYXB0aW9uRGlzcGxheU1vZGUgZGlzcGxheU1vZGU7CiAgICAgaWYgKHRyYWNr VG9TZWxlY3QgPT0gVGV4dFRyYWNrOjpjYXB0aW9uTWVudU9mZkl0ZW0oKSkKICAgICAgICAgZGlz cGxheU1vZGUgPSBDYXB0aW9uVXNlclByZWZlcmVuY2VzOjpGb3JjZWRPbmx5OwogICAgIGVsc2Ug aWYgKHRyYWNrVG9TZWxlY3QgPT0gVGV4dFRyYWNrOjpjYXB0aW9uTWVudUF1dG9tYXRpY0l0ZW0o KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JTdHlsZVRl eHRFZGl0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlVGV4 dEVkaXRvci5jcHAKaW5kZXggNTEzZGE4MzM2ZTRhMThlYWU4OGIxNzliMjc3NzJjNWY0ODAyOWQ0 Ni4uYjlmZjA5NjhmMmIwMzhkZGEyN2QzZjliYTVhYzk4ZmI1ODk1NjdiZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlVGV4dEVkaXRvci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclN0eWxlVGV4dEVkaXRvci5jcHAK QEAgLTEyNCwxNyArMTI0LDExIEBAIHZvaWQgSW5zcGVjdG9yU3R5bGVUZXh0RWRpdG9yOjpyZXBs YWNlUHJvcGVydHkodW5zaWduZWQgaW5kZXgsIGNvbnN0IFN0cmluZyYgbmV3CiAgICAgQVNTRVJU X1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oaW5kZXggPCBtX2FsbFByb3BlcnRpZXMtPnNpemUo KSk7CiAKICAgICBjb25zdCBJbnNwZWN0b3JTdHlsZVByb3BlcnR5JiBwcm9wZXJ0eSA9IG1fYWxs UHJvcGVydGllcy0+YXQoaW5kZXgpOwotICAgIGxvbmcgcHJvcGVydHlTdGFydCA9IHByb3BlcnR5 LnNvdXJjZURhdGEucmFuZ2Uuc3RhcnQ7Ci0gICAgbG9uZyBwcm9wZXJ0eUVuZCA9IHByb3BlcnR5 LnNvdXJjZURhdGEucmFuZ2UuZW5kOwotICAgIGxvbmcgb2xkTGVuZ3RoID0gcHJvcGVydHlFbmQg LSBwcm9wZXJ0eVN0YXJ0OwotICAgIGxvbmcgbmV3TGVuZ3RoID0gbmV3VGV4dC5sZW5ndGgoKTsK LSAgICBsb25nIHByb3BlcnR5TGVuZ3RoRGVsdGEgPSBuZXdMZW5ndGggLSBvbGRMZW5ndGg7Ci0K ICAgICBpZiAoIXByb3BlcnR5LmRpc2FibGVkKSB7CiAgICAgICAgIFNvdXJjZVJhbmdlIG92ZXJ3 cml0dGVuUmFuZ2U7CiAgICAgICAgIHVuc2lnbmVkIGluc2VydGVkTGVuZ3RoOwogICAgICAgICBp bnRlcm5hbFJlcGxhY2VQcm9wZXJ0eShwcm9wZXJ0eSwgbmV3VGV4dCwgJm92ZXJ3cml0dGVuUmFu Z2UsICZpbnNlcnRlZExlbmd0aCk7Ci0gICAgICAgIHByb3BlcnR5TGVuZ3RoRGVsdGEgPSBzdGF0 aWNfY2FzdDxsb25nPihpbnNlcnRlZExlbmd0aCkgLSBzdGF0aWNfY2FzdDxsb25nPihvdmVyd3Jp dHRlblJhbmdlLmxlbmd0aCgpKTsKKyAgICAgICAgbG9uZyBwcm9wZXJ0eUxlbmd0aERlbHRhID0g c3RhdGljX2Nhc3Q8bG9uZz4oaW5zZXJ0ZWRMZW5ndGgpIC0gc3RhdGljX2Nhc3Q8bG9uZz4ob3Zl cndyaXR0ZW5SYW5nZS5sZW5ndGgoKSk7CiAKICAgICAgICAgLy8gUmVjb21wdXRlIHN1YnNlcXVl bnQgZGlzYWJsZWQgcHJvcGVydHkgcmFuZ2VzIGlmIGFjdGluZyBvbiBhIG5vbi1kaXNhYmxlZCBw cm9wZXJ0eS4KICAgICAgICAgc2hpZnREaXNhYmxlZFByb3BlcnRpZXMoZGlzYWJsZWRJbmRleEJ5 T3JkaW5hbChpbmRleCwgdHJ1ZSksIHByb3BlcnR5TGVuZ3RoRGVsdGEpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCmluZGV4IDIyZWU2NjJkMGE0MGI5 NGMxNTczNWFkYjEwZmM5NTU1ZDA0Y2NlOTkuLjRjNDI5YTU4OWVkZjJkNmMyMzQzNmIzMzQxYWEz MWFjMDc4NGUxZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVD b250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJv bGxlci5jcHAKQEAgLTE5OSw5ICsxOTksOCBAQCBzdGF0aWMgdm9pZCBvcGVuTmV3V2luZG93KGNv bnN0IFVSTCYgdXJsVG9Mb2FkLCBGcmFtZSogZnJhbWUpCiAgICAgICAgIHJldHVybjsKICAgICAK ICAgICBGcmFtZUxvYWRSZXF1ZXN0IHJlcXVlc3QoZnJhbWUtPmRvY3VtZW50KCktPnNlY3VyaXR5 T3JpZ2luKCksIFJlc291cmNlUmVxdWVzdCh1cmxUb0xvYWQsIGZyYW1lLT5sb2FkZXIoKS5vdXRn b2luZ1JlZmVycmVyKCkpKTsKLSAgICBQYWdlKiBuZXdQYWdlID0gb2xkUGFnZTsKIAotICAgIG5l d1BhZ2UgPSBvbGRQYWdlLT5jaHJvbWUoKS5jcmVhdGVXaW5kb3coZnJhbWUsIHJlcXVlc3QsIFdp bmRvd0ZlYXR1cmVzKCksIE5hdmlnYXRpb25BY3Rpb24ocmVxdWVzdC5yZXNvdXJjZVJlcXVlc3Qo KSkpOworICAgIFBhZ2UqIG5ld1BhZ2UgPSBvbGRQYWdlLT5jaHJvbWUoKS5jcmVhdGVXaW5kb3co ZnJhbWUsIHJlcXVlc3QsIFdpbmRvd0ZlYXR1cmVzKCksIE5hdmlnYXRpb25BY3Rpb24ocmVxdWVz dC5yZXNvdXJjZVJlcXVlc3QoKSkpOwogICAgIGlmICghbmV3UGFnZSkKICAgICAgICAgcmV0dXJu OwogICAgIG5ld1BhZ2UtPmNocm9tZSgpLnNob3coKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29u dHJvbGxlci5jcHAKaW5kZXggNTMxNDgzZGQ4MzVlOGVlNWZkNjMyYTc1MjkyZjMxY2FmM2MwMzQ0 ZC4uZDRiYWI1MTE4NDdlNmY5NGQwNjkxMDExNDljYWE0YTFlOWIwNDFiNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9EcmFnQ29udHJvbGxlci5jcHAKQEAgLTg0LDEzICs4NCwxMSBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIHN0YXRpYyBQbGF0Zm9ybU1vdXNlRXZlbnQgY3JlYXRlTW91c2VFdmVudChE cmFnRGF0YSYgZHJhZ0RhdGEpCiB7Ci0gICAgYm9vbCBzaGlmdEtleSwgY3RybEtleSwgYWx0S2V5 LCBtZXRhS2V5OwotICAgIHNoaWZ0S2V5ID0gY3RybEtleSA9IGFsdEtleSA9IG1ldGFLZXkgPSBm YWxzZTsKICAgICBpbnQga2V5U3RhdGUgPSBkcmFnRGF0YS5tb2RpZmllcktleVN0YXRlKCk7Ci0g ICAgc2hpZnRLZXkgPSBzdGF0aWNfY2FzdDxib29sPihrZXlTdGF0ZSAmIFBsYXRmb3JtRXZlbnQ6 OlNoaWZ0S2V5KTsKLSAgICBjdHJsS2V5ID0gc3RhdGljX2Nhc3Q8Ym9vbD4oa2V5U3RhdGUgJiBQ bGF0Zm9ybUV2ZW50OjpDdHJsS2V5KTsKLSAgICBhbHRLZXkgPSBzdGF0aWNfY2FzdDxib29sPihr ZXlTdGF0ZSAmIFBsYXRmb3JtRXZlbnQ6OkFsdEtleSk7Ci0gICAgbWV0YUtleSA9IHN0YXRpY19j YXN0PGJvb2w+KGtleVN0YXRlICYgUGxhdGZvcm1FdmVudDo6TWV0YUtleSk7CisgICAgYm9vbCBz aGlmdEtleSA9IHN0YXRpY19jYXN0PGJvb2w+KGtleVN0YXRlICYgUGxhdGZvcm1FdmVudDo6U2hp ZnRLZXkpOworICAgIGJvb2wgY3RybEtleSA9IHN0YXRpY19jYXN0PGJvb2w+KGtleVN0YXRlICYg UGxhdGZvcm1FdmVudDo6Q3RybEtleSk7CisgICAgYm9vbCBhbHRLZXkgPSBzdGF0aWNfY2FzdDxi b29sPihrZXlTdGF0ZSAmIFBsYXRmb3JtRXZlbnQ6OkFsdEtleSk7CisgICAgYm9vbCBtZXRhS2V5 ID0gc3RhdGljX2Nhc3Q8Ym9vbD4oa2V5U3RhdGUgJiBQbGF0Zm9ybUV2ZW50OjpNZXRhS2V5KTsK IAogICAgIHJldHVybiBQbGF0Zm9ybU1vdXNlRXZlbnQoZHJhZ0RhdGEuY2xpZW50UG9zaXRpb24o KSwgZHJhZ0RhdGEuZ2xvYmFsUG9zaXRpb24oKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIExlZnRCdXR0b24sIFBsYXRmb3JtRXZlbnQ6Ok1vdXNlTW92ZWQsIDAsIHNoaWZ0S2V5LCBj dHJsS2V5LCBhbHRLZXksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zs b3cuY3BwCmluZGV4IDZkNDkzNzI0M2FhOTk0ZGEyODI2MWRkMjZlYzk2MTAzYzA5NjA4MTIuLjU1 ZWNlNzM0Y2FmMTMyOTVlZGY2MmE4MjA4OWRkOGVmOTA5MGY1OGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0zOTQ0LDggKzM5NDQsNyBAQCB2 b2lkIFJlbmRlckJsb2NrRmxvdzo6Y29tcHV0ZUlubGluZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMo TGF5b3V0VW5pdCYgbWluTG9naWNhbAogICAgIC8vIE5vdCBzdXBwb3J0aW5nIHRoZSBxdWlyayBo YXMgY2F1c2VkIHVzIHRvIG1pcy1yZW5kZXIgc29tZSByZWFsIHNpdGVzLiAoU2VlIEJ1Z3ppbGxh IDEwNTE3LikgCiAgICAgYm9vbCBhbGxvd0ltYWdlc1RvQnJlYWsgPSAhZG9jdW1lbnQoKS5pblF1 aXJrc01vZGUoKSB8fCAhaXNUYWJsZUNlbGwoKSB8fCAhc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgo KS5pc0ludHJpbnNpY09yQXV0bygpOwogCi0gICAgYm9vbCBhdXRvV3JhcCwgb2xkQXV0b1dyYXA7 Ci0gICAgYXV0b1dyYXAgPSBvbGRBdXRvV3JhcCA9IHN0eWxlVG9Vc2UuYXV0b1dyYXAoKTsKKyAg ICBib29sIG9sZEF1dG9XcmFwID0gc3R5bGVUb1VzZS5hdXRvV3JhcCgpOwogCiAgICAgSW5saW5l TWluTWF4SXRlcmF0b3IgY2hpbGRJdGVyYXRvcigqdGhpcyk7CiAKQEAgLTM5NTksNyArMzk1OCw3 IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93Ojpjb21wdXRlSW5saW5lUHJlZmVycmVkTG9naWNhbFdp ZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsCiAgICAgYm9vbCBpc1ByZXZDaGlsZElubGluZUZs b3cgPSBmYWxzZTsKICAgICBib29sIHNob3VsZEJyZWFrTGluZUFmdGVyVGV4dCA9IGZhbHNlOwog ICAgIHdoaWxlIChSZW5kZXJPYmplY3QqIGNoaWxkID0gY2hpbGRJdGVyYXRvci5uZXh0KCkpIHsK LSAgICAgICAgYXV0b1dyYXAgPSBjaGlsZC0+aXNSZXBsYWNlZCgpID8gY2hpbGQtPnBhcmVudCgp LT5zdHlsZSgpLmF1dG9XcmFwKCkgOiAKKyAgICAgICAgYm9vbCBhdXRvV3JhcCA9IGNoaWxkLT5p c1JlcGxhY2VkKCkgPyBjaGlsZC0+cGFyZW50KCktPnN0eWxlKCkuYXV0b1dyYXAoKSA6CiAgICAg ICAgICAgICBjaGlsZC0+c3R5bGUoKS5hdXRvV3JhcCgpOwogCiAgICAgICAgIGlmICghY2hpbGQt PmlzQlIoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJ bmxpbmVUZXh0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHSW5saW5l VGV4dEJveC5jcHAKaW5kZXggMzBkMGViNTI2MTcyYTQ4ZjhmMmIyNzcwMzU2YTM5NTY1MDdhMjk5 Yi4uMDcwZjFmNzRlYTkyMGMyYWVjZmY3ZWU0ODE5Njk3MjNiZGRhNmE3OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9TVkdJbmxpbmVUZXh0Qm94LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NWR0lubGluZVRleHRCb3guY3BwCkBAIC0yMDcs MTMgKzIwNyw2IEBAIHZvaWQgU1ZHSW5saW5lVGV4dEJveDo6cGFpbnRTZWxlY3Rpb25CYWNrZ3Jv dW5kKFBhaW50SW5mbyYgcGFpbnRJbmZvKQogCiAgICAgUmVuZGVyU3R5bGUmIHN0eWxlID0gcGFy ZW50UmVuZGVyZXIuc3R5bGUoKTsKIAotICAgIFJlbmRlclN0eWxlKiBzZWxlY3Rpb25TdHlsZSA9 ICZzdHlsZTsKLSAgICBpZiAoaGFzU2VsZWN0aW9uKSB7Ci0gICAgICAgIHNlbGVjdGlvblN0eWxl ID0gcGFyZW50UmVuZGVyZXIuZ2V0Q2FjaGVkUHNldWRvU3R5bGUoU0VMRUNUSU9OKTsKLSAgICAg ICAgaWYgKCFzZWxlY3Rpb25TdHlsZSkKLSAgICAgICAgICAgIHNlbGVjdGlvblN0eWxlID0gJnN0 eWxlOwotICAgIH0KLQogICAgIGludCBzdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlvbjsKICAgICBz ZWxlY3Rpb25TdGFydEVuZChzdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlvbik7CiAK