141764 2015-02-18 12:35:28 -0800 Page::userContentController() should return a reference, not a pointer 2015-02-18 13:42:25 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All REOPENED P2 Normal --- 141766 1 beidson beidson commit-queue esprehn+autocc japhet kangil.han oldest_to_newest 1070194 0 beidson 2015-02-18 12:35:28 -0800 Page::userContentController() should return a reference, not a pointer We should never have to be null checking this thing. 1070195 1 246840 beidson 2015-02-18 12:37:48 -0800 Created attachment 246840 Patch v1 1070200 2 beidson 2015-02-18 12:52:45 -0800 http://trac.webkit.org/changeset/180286 1070211 3 commit-queue 2015-02-18 13:42:25 -0800 Re-opened since this is blocked by bug 141766 246840 2015-02-18 12:37:48 -0800 2015-02-18 12:43:51 -0800 Patch v1 patch text/plain 11842 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmNDliNjlkLi4xYjgwZDBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTUtMDItMTggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAg ICAgIFBhZ2U6OnVzZXJDb250ZW50Q29udHJvbGxlcigpIHNob3VsZCByZXR1cm4gYSByZWZlcmVu Y2UsIG5vdCBhIHBvaW50ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0MTc2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cyAoTm8gYmVoYXZpb3IgY2hhbmdlKQorCisgICAgICAgICog ZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlvbjo6dXBkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2Fj aGUpOgorICAgICAgICAqIGxvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdFJlc291cmNlKToK KyAgICAgICAgKiBwYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlczo6dXBkYXRlQ2FwdGlvblN0eWxlU2hlZXRPdmVy aWRlKToKKyAgICAgICAgKiBwYWdlL0RPTVdpbmRvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpE T01XaW5kb3c6OnNob3VsZEhhdmVXZWJLaXROYW1lc3BhY2VGb3JXb3JsZCk6CisgICAgICAgICog cGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZTo6aW5qZWN0VXNlclNjcmlw dHMpOgorICAgICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpQ YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlBhZ2U6On5QYWdlKToKKyAgICAgICAgKFdlYkNvcmU6 OlBhZ2U6OnNldFVzZXJDb250ZW50Q29udHJvbGxlcik6CisgICAgICAgICogcGFnZS9QYWdlLmg6 CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjp1c2VyQ29udGVudENvbnRyb2xsZXIpOgorICAgICAg ICAqIHBhZ2UvVXNlck1lc3NhZ2VIYW5kbGVyc05hbWVzcGFjZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpVc2VyTWVzc2FnZUhhbmRsZXJzTmFtZXNwYWNlOjpoYW5kbGVyKToKKwogMjAxNS0wMi0x MyAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBb Q1NTIEdyaWQgTGF5b3V0XSBJbnZhbGlkIGluaXRpYWxpemF0aW9uIG9mIHRyYWNrIHNpemVzIHdp dGggbm9uIHNwYW5uaW5nIGdyaWQgaXRlbXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudFN0eWxlU2hlZXRDb2xsZWN0aW9uLmNwcAppbmRleCA4YWUzMWU5Li41M2Q5MGI3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVjdGlv bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50U3R5bGVTaGVldENvbGxlY3Rp b24uY3BwCkBAIC0xMzcsMTEgKzEzNyw3IEBAIHZvaWQgRG9jdW1lbnRTdHlsZVNoZWV0Q29sbGVj dGlvbjo6dXBkYXRlSW5qZWN0ZWRTdHlsZVNoZWV0Q2FjaGUoKSBjb25zdAogICAgIGlmICghb3du aW5nUGFnZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgY29uc3QgYXV0byogdXNlckNvbnRlbnRD b250cm9sbGVyID0gb3duaW5nUGFnZS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCk7Ci0gICAgaWYg KCF1c2VyQ29udGVudENvbnRyb2xsZXIpCi0gICAgICAgIHJldHVybjsKLQotICAgIGNvbnN0IFVz ZXJTdHlsZVNoZWV0TWFwKiB1c2VyU3R5bGVTaGVldHMgPSB1c2VyQ29udGVudENvbnRyb2xsZXIt PnVzZXJTdHlsZVNoZWV0cygpOworICAgIGNvbnN0IFVzZXJTdHlsZVNoZWV0TWFwKiB1c2VyU3R5 bGVTaGVldHMgPSBvd25pbmdQYWdlLT51c2VyQ29udGVudENvbnRyb2xsZXIoKS51c2VyU3R5bGVT aGVldHMoKTsKICAgICBpZiAoIXVzZXJTdHlsZVNoZWV0cykKICAgICAgICAgcmV0dXJuOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2Fk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVy LmNwcAppbmRleCAwN2JhOTI3Li41ZmU1YmYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKQEAgLTQ2NCw3ICs0NjQsNyBA QCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRSZXNvdXJjZT4gQ2FjaGVkUmVzb3VyY2VMb2Fk ZXI6OnJlcXVlc3RSZXNvdXJjZShDYWNoZQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAogI2lm IEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCi0gICAgaWYgKGZyYW1lKCkgJiYgZnJhbWUoKS0+ cGFnZSgpICYmIGZyYW1lKCktPnBhZ2UoKS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkgJiYgZnJh bWUoKS0+cGFnZSgpLT51c2VyQ29udGVudENvbnRyb2xsZXIoKS0+Y29udGVudEZpbHRlckJsb2Nr c1VSTCh1cmwpKQorICAgIGlmIChmcmFtZSgpICYmIGZyYW1lKCktPnBhZ2UoKSAmJiBmcmFtZSgp LT5wYWdlKCktPnVzZXJDb250ZW50Q29udHJvbGxlcigpLmNvbnRlbnRGaWx0ZXJCbG9ja3NVUkwo dXJsKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2VzLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvQ2FwdGlvblVzZXJQcmVmZXJlbmNlcy5jcHAKaW5kZXggMGVkMmNhNC4uZmUzMGE5 NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9DYXB0aW9uVXNlclByZWZlcmVuY2Vz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NhcHRpb25Vc2VyUHJlZmVyZW5jZXMuY3Bw CkBAIC0yNzYsMjAgKzI3NiwxNiBAQCB2b2lkIENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OnVwZGF0 ZUNhcHRpb25TdHlsZVNoZWV0T3ZlcmlkZSgpCiAgICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElD X0xPQ0FMKFVSTCwgY2FwdGlvbnNTdHlsZVNoZWV0VVJMLCAoUGFyc2VkVVJMU3RyaW5nLCAidXNl ci1jYXB0aW9ucy1vdmVycmlkZTowMUY2QUYxMi1DM0IwLTRGNzAtQUY1RS1BM0UwMDIzNERDMjMi KSk7CiAKICAgICBhdXRvJiBwYWdlcyA9IG1fcGFnZUdyb3VwLnBhZ2VzKCk7Ci0gICAgZm9yIChh dXRvJiBwYWdlIDogcGFnZXMpIHsKLSAgICAgICAgaWYgKGF1dG8qIHBhZ2VVc2VyQ29udGVudENv bnRyb2xsZXIgPSBwYWdlLT51c2VyQ29udGVudENvbnRyb2xsZXIoKSkKLSAgICAgICAgICAgIHBh Z2VVc2VyQ29udGVudENvbnRyb2xsZXItPnJlbW92ZVVzZXJTdHlsZVNoZWV0KG1haW5UaHJlYWRO b3JtYWxXb3JsZCgpLCBjYXB0aW9uc1N0eWxlU2hlZXRVUkwpOwotICAgIH0KKyAgICBmb3IgKGF1 dG8mIHBhZ2UgOiBwYWdlcykKKyAgICAgICAgcGFnZS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCku cmVtb3ZlVXNlclN0eWxlU2hlZXQobWFpblRocmVhZE5vcm1hbFdvcmxkKCksIGNhcHRpb25zU3R5 bGVTaGVldFVSTCk7CiAKICAgICBTdHJpbmcgY2FwdGlvbnNPdmVycmlkZVN0eWxlU2hlZXQgPSBj YXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZSgpOwogICAgIGlmIChjYXB0aW9uc092ZXJyaWRlU3R5 bGVTaGVldC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGZvciAoYXV0byYgcGFn ZSA6IHBhZ2VzKSB7Ci0gICAgICAgIGlmIChhdXRvKiBwYWdlVXNlckNvbnRlbnRDb250cm9sbGVy ID0gcGFnZS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkpIHsKLSAgICAgICAgICAgIGF1dG8gdXNl clN0eWxlU2hlZXQgPSBzdGQ6Om1ha2VfdW5pcXVlPFVzZXJTdHlsZVNoZWV0PihjYXB0aW9uc092 ZXJyaWRlU3R5bGVTaGVldCwgY2FwdGlvbnNTdHlsZVNoZWV0VVJMLCBWZWN0b3I8U3RyaW5nPigp LCBWZWN0b3I8U3RyaW5nPigpLCBJbmplY3RJbkFsbEZyYW1lcywgVXNlclN0eWxlQXV0aG9yTGV2 ZWwpOwotICAgICAgICAgICAgcGFnZVVzZXJDb250ZW50Q29udHJvbGxlci0+YWRkVXNlclN0eWxl U2hlZXQobWFpblRocmVhZE5vcm1hbFdvcmxkKCksIFdURjo6bW92ZSh1c2VyU3R5bGVTaGVldCks IEluamVjdEluRXhpc3RpbmdEb2N1bWVudHMpOwotICAgICAgICB9CisgICAgICAgIGF1dG8gdXNl clN0eWxlU2hlZXQgPSBzdGQ6Om1ha2VfdW5pcXVlPFVzZXJTdHlsZVNoZWV0PihjYXB0aW9uc092 ZXJyaWRlU3R5bGVTaGVldCwgY2FwdGlvbnNTdHlsZVNoZWV0VVJMLCBWZWN0b3I8U3RyaW5nPigp LCBWZWN0b3I8U3RyaW5nPigpLCBJbmplY3RJbkFsbEZyYW1lcywgVXNlclN0eWxlQXV0aG9yTGV2 ZWwpOworICAgICAgICBwYWdlLT51c2VyQ29udGVudENvbnRyb2xsZXIoKS5hZGRVc2VyU3R5bGVT aGVldChtYWluVGhyZWFkTm9ybWFsV29ybGQoKSwgV1RGOjptb3ZlKHVzZXJTdHlsZVNoZWV0KSwg SW5qZWN0SW5FeGlzdGluZ0RvY3VtZW50cyk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdp bmRvdy5jcHAKaW5kZXggZWExNjE1OC4uZGIyYThiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9ET01XaW5kb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93 LmNwcApAQCAtNzU4LDExICs3NTgsNyBAQCBib29sIERPTVdpbmRvdzo6c2hvdWxkSGF2ZVdlYktp dE5hbWVzcGFjZUZvcldvcmxkKERPTVdyYXBwZXJXb3JsZCYgd29ybGQpCiAgICAgaWYgKCFwYWdl KQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBhdXRvKiB1c2VyQ29udGVudENvbnRyb2xs ZXIgPSBwYWdlLT51c2VyQ29udGVudENvbnRyb2xsZXIoKTsKLSAgICBpZiAoIXVzZXJDb250ZW50 Q29udHJvbGxlcikKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgYXV0byogZGVzY3JpcHRv ck1hcCA9IHVzZXJDb250ZW50Q29udHJvbGxlci0+dXNlck1lc3NhZ2VIYW5kbGVyRGVzY3JpcHRv cnMoKTsKKyAgICBhdXRvKiBkZXNjcmlwdG9yTWFwID0gcGFnZS0+dXNlckNvbnRlbnRDb250cm9s bGVyKCkudXNlck1lc3NhZ2VIYW5kbGVyRGVzY3JpcHRvcnMoKTsKICAgICBpZiAoIWRlc2NyaXB0 b3JNYXApCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAppbmRleCA5 ODhhZDA2Li41Zjg5NzFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcApAQCAtNjk1LDEyICs2OTUsOCBA QCB2b2lkIEZyYW1lOjppbmplY3RVc2VyU2NyaXB0cyhVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSBp bmplY3Rpb25UaW1lKQogICAgIGlmIChsb2FkZXIoKS5zdGF0ZU1hY2hpbmUoKS5jcmVhdGluZ0lu aXRpYWxFbXB0eURvY3VtZW50KCkgJiYgIXNldHRpbmdzKCkuc2hvdWxkSW5qZWN0VXNlclNjcmlw dHNJbkluaXRpYWxFbXB0eURvY3VtZW50KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGNvbnN0 IGF1dG8qIHVzZXJDb250ZW50Q29udHJvbGxlciA9IG1fcGFnZS0+dXNlckNvbnRlbnRDb250cm9s bGVyKCk7Ci0gICAgaWYgKCF1c2VyQ29udGVudENvbnRyb2xsZXIpCi0gICAgICAgIHJldHVybjsK LQogICAgIC8vIFdhbGsgdGhlIGhhc2h0YWJsZS4gSW5qZWN0IGJ5IHdvcmxkLgotICAgIGNvbnN0 IFVzZXJTY3JpcHRNYXAqIHVzZXJTY3JpcHRzID0gdXNlckNvbnRlbnRDb250cm9sbGVyLT51c2Vy U2NyaXB0cygpOworICAgIGNvbnN0IFVzZXJTY3JpcHRNYXAqIHVzZXJTY3JpcHRzID0gbV9wYWdl LT51c2VyQ29udGVudENvbnRyb2xsZXIoKS51c2VyU2NyaXB0cygpOwogICAgIGlmICghdXNlclNj cmlwdHMpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggMDZiOTFiYS4u MDllZTMxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0yMDQsNyArMjA0LDcgQEAgUGFnZTo6UGFn ZShQYWdlQ29uZmlndXJhdGlvbiYgcGFnZUNvbmZpZ3VyYXRpb24pCiAgICAgLCBtX2ZyYW1lc0hh bmRsaW5nQmVmb3JlVW5sb2FkRXZlbnQoMCkKICAgICAsIG1fZGF0YWJhc2VQcm92aWRlcigqV1RG Ojptb3ZlKHBhZ2VDb25maWd1cmF0aW9uLmRhdGFiYXNlUHJvdmlkZXIpKQogICAgICwgbV9zdG9y YWdlTmFtZXNwYWNlUHJvdmlkZXIoKldURjo6bW92ZShwYWdlQ29uZmlndXJhdGlvbi5zdG9yYWdl TmFtZXNwYWNlUHJvdmlkZXIpKQotICAgICwgbV91c2VyQ29udGVudENvbnRyb2xsZXIoV1RGOjpt b3ZlKHBhZ2VDb25maWd1cmF0aW9uLnVzZXJDb250ZW50Q29udHJvbGxlcikpCisgICAgLCBtX3Vz ZXJDb250ZW50Q29udHJvbGxlcigqV1RGOjptb3ZlKHBhZ2VDb25maWd1cmF0aW9uLnVzZXJDb250 ZW50Q29udHJvbGxlcikpCiAgICAgLCBtX3Zpc2l0ZWRMaW5rU3RvcmUoKldURjo6bW92ZShwYWdl Q29uZmlndXJhdGlvbi52aXNpdGVkTGlua1N0b3JlKSkKICAgICAsIG1fc2Vzc2lvbklEKFNlc3Np b25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKQogICAgICwgbV9pc0Nsb3NpbmcoZmFsc2UpCkBAIC0y MTMsMTAgKzIxMyw3IEBAIFBhZ2U6OlBhZ2UoUGFnZUNvbmZpZ3VyYXRpb24mIHBhZ2VDb25maWd1 cmF0aW9uKQogICAgIHNldFRpbWVyVGhyb3R0bGluZ0VuYWJsZWQobV92aWV3U3RhdGUgJiBWaWV3 U3RhdGU6OklzVmlzdWFsbHlJZGxlKTsKIAogICAgIG1fc3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVy LT5hZGRQYWdlKCp0aGlzKTsKLQotICAgIGlmIChtX3VzZXJDb250ZW50Q29udHJvbGxlcikKLSAg ICAgICAgbV91c2VyQ29udGVudENvbnRyb2xsZXItPmFkZFBhZ2UoKnRoaXMpOwotCisgICAgbV91 c2VyQ29udGVudENvbnRyb2xsZXItPmFkZFBhZ2UoKnRoaXMpOwogICAgIG1fdmlzaXRlZExpbmtT dG9yZS0+YWRkUGFnZSgqdGhpcyk7CiAKICAgICBpZiAoIWFsbFBhZ2VzKSB7CkBAIC0yNjgsOSAr MjY1LDcgQEAgUGFnZTo6flBhZ2UoKQogI2VuZGlmCiAKICAgICBtX3N0b3JhZ2VOYW1lc3BhY2VQ cm92aWRlci0+cmVtb3ZlUGFnZSgqdGhpcyk7Ci0KLSAgICBpZiAobV91c2VyQ29udGVudENvbnRy b2xsZXIpCi0gICAgICAgIG1fdXNlckNvbnRlbnRDb250cm9sbGVyLT5yZW1vdmVQYWdlKCp0aGlz KTsKKyAgICBtX3VzZXJDb250ZW50Q29udHJvbGxlci0+cmVtb3ZlUGFnZSgqdGhpcyk7CiAgICAg bV92aXNpdGVkTGlua1N0b3JlLT5yZW1vdmVQYWdlKCp0aGlzKTsKIH0KIApAQCAtMTYyMiwxNSAr MTYxNywxMSBAQCBib29sIFBhZ2U6OmlzQW55RnJhbWVIYW5kbGluZ0JlZm9yZVVubG9hZEV2ZW50 KCkKICAgICByZXR1cm4gbV9mcmFtZXNIYW5kbGluZ0JlZm9yZVVubG9hZEV2ZW50OwogfQogCi12 b2lkIFBhZ2U6OnNldFVzZXJDb250ZW50Q29udHJvbGxlcihVc2VyQ29udGVudENvbnRyb2xsZXIq IHVzZXJDb250ZW50Q29udHJvbGxlcikKK3ZvaWQgUGFnZTo6c2V0VXNlckNvbnRlbnRDb250cm9s bGVyKFJlZjxVc2VyQ29udGVudENvbnRyb2xsZXI+JiYgdXNlckNvbnRlbnRDb250cm9sbGVyKQog ewotICAgIGlmIChtX3VzZXJDb250ZW50Q29udHJvbGxlcikKLSAgICAgICAgbV91c2VyQ29udGVu dENvbnRyb2xsZXItPnJlbW92ZVBhZ2UoKnRoaXMpOwotCi0gICAgbV91c2VyQ29udGVudENvbnRy b2xsZXIgPSB1c2VyQ29udGVudENvbnRyb2xsZXI7Ci0KLSAgICBpZiAobV91c2VyQ29udGVudENv bnRyb2xsZXIpCi0gICAgICAgIG1fdXNlckNvbnRlbnRDb250cm9sbGVyLT5hZGRQYWdlKCp0aGlz KTsKKyAgICBtX3VzZXJDb250ZW50Q29udHJvbGxlci0+cmVtb3ZlUGFnZSgqdGhpcyk7CisgICAg bV91c2VyQ29udGVudENvbnRyb2xsZXIgPSBXVEY6Om1vdmUodXNlckNvbnRlbnRDb250cm9sbGVy KTsKKyAgICBtX3VzZXJDb250ZW50Q29udHJvbGxlci0+YWRkUGFnZSgqdGhpcyk7CiAKICAgICBm b3IgKEZyYW1lKiBmcmFtZSA9ICZtYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRy ZWUoKS50cmF2ZXJzZU5leHQoKSkgewogICAgICAgICBpZiAoRG9jdW1lbnQgKmRvY3VtZW50ID0g ZnJhbWUtPmRvY3VtZW50KCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFn ZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKaW5kZXggN2ZjZjdhYi4uZDQ1ZmNjMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlLmgKQEAgLTQwNiw4ICs0MDYsOCBAQCBwdWJsaWM6CiAgICAgU3RvcmFnZU5h bWVzcGFjZVByb3ZpZGVyJiBzdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKSB7IHJldHVybiBtX3N0 b3JhZ2VOYW1lc3BhY2VQcm92aWRlci5nZXQoKTsgfQogICAgIHZvaWQgc2V0U3RvcmFnZU5hbWVz cGFjZVByb3ZpZGVyKFJlZjxTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXI+JiYpOwogCi0gICAgVXNl ckNvbnRlbnRDb250cm9sbGVyKiB1c2VyQ29udGVudENvbnRyb2xsZXIoKSB7IHJldHVybiBtX3Vz ZXJDb250ZW50Q29udHJvbGxlci5nZXQoKTsgfQotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0 VXNlckNvbnRlbnRDb250cm9sbGVyKFVzZXJDb250ZW50Q29udHJvbGxlciopOworICAgIFVzZXJD b250ZW50Q29udHJvbGxlciYgdXNlckNvbnRlbnRDb250cm9sbGVyKCkgeyByZXR1cm4gbV91c2Vy Q29udGVudENvbnRyb2xsZXIuZ2V0KCk7IH0KKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFVz ZXJDb250ZW50Q29udHJvbGxlcihSZWY8VXNlckNvbnRlbnRDb250cm9sbGVyPiYmKTsKIAogICAg IFZpc2l0ZWRMaW5rU3RvcmUmIHZpc2l0ZWRMaW5rU3RvcmUoKTsKICAgICBXRUJDT1JFX0VYUE9S VCB2b2lkIHNldFZpc2l0ZWRMaW5rU3RvcmUoUmVmPFZpc2l0ZWRMaW5rU3RvcmU+JiYpOwpAQCAt NTc0LDcgKzU3NCw3IEBAIHByaXZhdGU6CiAKICAgICBSZWY8RGF0YWJhc2VQcm92aWRlcj4gbV9k YXRhYmFzZVByb3ZpZGVyOwogICAgIFJlZjxTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXI+IG1fc3Rv cmFnZU5hbWVzcGFjZVByb3ZpZGVyOwotICAgIFJlZlB0cjxVc2VyQ29udGVudENvbnRyb2xsZXI+ IG1fdXNlckNvbnRlbnRDb250cm9sbGVyOworICAgIFJlZjxVc2VyQ29udGVudENvbnRyb2xsZXI+ IG1fdXNlckNvbnRlbnRDb250cm9sbGVyOwogICAgIFJlZjxWaXNpdGVkTGlua1N0b3JlPiBtX3Zp c2l0ZWRMaW5rU3RvcmU7CiAKICAgICBIYXNoU2V0PFZpZXdTdGF0ZUNoYW5nZU9ic2VydmVyKj4g bV92aWV3U3RhdGVDaGFuZ2VPYnNlcnZlcnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1VzZXJNZXNzYWdlSGFuZGxlcnNOYW1lc3BhY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9Vc2VyTWVzc2FnZUhhbmRsZXJzTmFtZXNwYWNlLmNwcAppbmRleCBjOWFlOTI2Li5mMzc5YWIz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJNZXNzYWdlSGFuZGxlcnNOYW1l c3BhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlck1lc3NhZ2VIYW5kbGVyc05h bWVzcGFjZS5jcHAKQEAgLTU5LDEyICs1OSw4IEBAIFVzZXJNZXNzYWdlSGFuZGxlciogVXNlck1l c3NhZ2VIYW5kbGVyc05hbWVzcGFjZTo6aGFuZGxlcihjb25zdCBBdG9taWNTdHJpbmcmIG5hCiAg ICAgUGFnZSogcGFnZSA9IGZyYW1lKCktPnBhZ2UoKTsKICAgICBpZiAoIXBhZ2UpCiAgICAgICAg IHJldHVybiBudWxscHRyOwotICAgIAotICAgIGNvbnN0IGF1dG8qIHVzZXJDb250ZW50Q29udHJv bGxlciA9IHBhZ2UtPnVzZXJDb250ZW50Q29udHJvbGxlcigpOwotICAgIGlmICghdXNlckNvbnRl bnRDb250cm9sbGVyKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIGNvbnN0IGF1dG8q IHVzZXJNZXNzYWdlSGFuZGxlckRlc2NyaXB0b3JzID0gdXNlckNvbnRlbnRDb250cm9sbGVyLT51 c2VyTWVzc2FnZUhhbmRsZXJEZXNjcmlwdG9ycygpOworICAgIGNvbnN0IGF1dG8qIHVzZXJNZXNz YWdlSGFuZGxlckRlc2NyaXB0b3JzID0gcGFnZS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkudXNl ck1lc3NhZ2VIYW5kbGVyRGVzY3JpcHRvcnMoKTsKICAgICBpZiAoIXVzZXJNZXNzYWdlSGFuZGxl ckRlc2NyaXB0b3JzKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmlu ZGV4IDJhNzc4YTkuLmI0MzVlM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxNS0wMi0xOCAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAg UGFnZTo6dXNlckNvbnRlbnRDb250cm9sbGVyKCkgc2hvdWxkIHJldHVybiBhIHJlZmVyZW5jZSwg bm90IGEgcG9pbnRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQxNzY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBXZWJWaWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgc2V0R3JvdXBO YW1lOl0pOgorCiAyMDE1LTAyLTE0ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5j b20+CiAKICAgICAgICAgW01hY10gUG9zc2libGUgRERBY3Rpb25Db250ZXh0IGxlYWtzLCBSZXRh aW5QdHIgY2xlYW51cApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJW aWV3Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IGMyYmRh ZGUuLmQzNGI0OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmll dy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTYxMTcs NyArNjExNyw3IEBAIHN0YXRpYyBXZWJGcmFtZSAqaW5jcmVtZW50RnJhbWUoV2ViRnJhbWUgKmZy YW1lLCBXZWJGaW5kT3B0aW9ucyBvcHRpb25zID0gMCkKICAgICBpZiAoIV9wcml2YXRlLT5wYWdl KQogICAgICAgICByZXR1cm47CiAKLSAgICBfcHJpdmF0ZS0+cGFnZS0+c2V0VXNlckNvbnRlbnRD b250cm9sbGVyKCZfcHJpdmF0ZS0+Z3JvdXAtPnVzZXJDb250ZW50Q29udHJvbGxlcigpKTsKKyAg ICBfcHJpdmF0ZS0+cGFnZS0+c2V0VXNlckNvbnRlbnRDb250cm9sbGVyKF9wcml2YXRlLT5ncm91 cC0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkpOwogICAgIF9wcml2YXRlLT5wYWdlLT5zZXRWaXNp dGVkTGlua1N0b3JlKF9wcml2YXRlLT5ncm91cC0+dmlzaXRlZExpbmtTdG9yZSgpKTsKICAgICBf cHJpdmF0ZS0+cGFnZS0+c2V0R3JvdXBOYW1lKGdyb3VwTmFtZSk7CiB9Cg==