72002 2011-11-09 23:56:00 -0800 Add NULL checks to setting access which is obtained on frame and document 2012-01-10 04:20:11 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 g.czajkowski webkit-unassigned ap cshu dglazkov japhet kling rakuco rniwa webkit.review.bot oldest_to_newest 499692 0 g.czajkowski 2011-11-09 23:56:00 -0800 Adds NULL checks to seeting object where it's required. Generally WebCore checks NULL which may be returned from setting object obtained on frame or document but in some cases these are skipped. These checks are not needed to setting's access on page object. 499694 1 114444 g.czajkowski 2011-11-09 23:57:07 -0800 Created attachment 114444 proposed patch 499696 2 114444 webkit-ews 2011-11-10 00:01:14 -0800 Comment on attachment 114444 proposed patch Attachment 114444 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10354296 499705 3 114444 webkit.review.bot 2011-11-10 00:20:40 -0800 Comment on attachment 114444 proposed patch Attachment 114444 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10401241 New failing tests: editing/input/password-echo-passnode.html editing/input/password-echo-passnode2.html 502768 4 115133 g.czajkowski 2011-11-15 03:00:09 -0800 Created attachment 115133 updated patch Fix WebKit-Qt build break 502792 5 115133 webkit.review.bot 2011-11-15 03:42:37 -0800 Comment on attachment 115133 updated patch Attachment 115133 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10483285 New failing tests: editing/input/password-echo-passnode.html editing/input/password-echo-passnode2.html 520861 6 g.czajkowski 2011-12-14 05:03:41 -0800 Hello Dimitri and Nate, Can you confirm that this patch may cause failing of those tests? I don't have environment with Chromium DumpRenderTree application so I'd glad to hear your opinion. Thanks. 524085 7 115133 eric 2011-12-19 11:53:20 -0800 Comment on attachment 115133 updated patch OK. Can we test this? 532888 8 rniwa 2012-01-10 01:49:18 -0800 (In reply to comment #5) > (From update of attachment 115133 [details]) > Attachment 115133 [details] did not pass chromium-ews (chromium-xvfb): > Output: http://queues.webkit.org/results/10483285 > > New failing tests: > editing/input/password-echo-passnode.html > editing/input/password-echo-passnode2.html Your patch probably breaks these two tests on all platforms (note: only cr-linux EWS bots run tests). 532892 9 g.czajkowski 2012-01-10 01:57:49 -0800 (In reply to comment #8) > (In reply to comment #5) > > (From update of attachment 115133 [details] [details]) > > Attachment 115133 [details] [details] did not pass chromium-ews (chromium-xvfb): > > Output: http://queues.webkit.org/results/10483285 > > > > New failing tests: > > editing/input/password-echo-passnode.html > > editing/input/password-echo-passnode2.html > > Your patch probably breaks these two tests on all platforms (note: only cr-linux EWS bots run tests). CC'ing Andreas Kling. Ok, Andreas has found bug in the patch. I will fix it. 532914 10 121815 g.czajkowski 2012-01-10 02:43:58 -0800 Created attachment 121815 updated patch Fixes bug which caused failing of tests. 532937 11 121815 kling 2012-01-10 03:28:01 -0800 Comment on attachment 121815 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=121815&action=review > Source/WebCore/ChangeLog:8 > + Adds NULL checks to seeting object where it's required. Typo, settings. 532946 12 121823 g.czajkowski 2012-01-10 03:43:46 -0800 Created attachment 121823 patch for landing Fixed typo. 532955 13 kling 2012-01-10 04:00:15 -0800 For the record, it's unfortunate that we don't have tests for these changes. However I believe these null-checks are sane and belong in WebKit. In the future, please provide tests that exercise your changes, or explain why tests aren't possible. 532961 14 121823 webkit.review.bot 2012-01-10 04:20:05 -0800 Comment on attachment 121823 patch for landing Clearing flags on attachment: 121823 Committed r104552: <http://trac.webkit.org/changeset/104552> 532962 15 webkit.review.bot 2012-01-10 04:20:11 -0800 All reviewed patches have been landed. Closing bug. 114444 2011-11-09 23:57:07 -0800 2011-11-15 03:00:09 -0800 proposed patch settings_add_null_checks.patch text/plain 12029 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZWFiYzFkLi5mMTUwOTE2IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEg QEAKKzIwMTEtMTEtMDkgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgQWRkIE5VTEwgY2hlY2tzIHRvIHNldHRpbmcgYWNjZXNzIHdoaWNo IGlzIG9idGFpbmVkIG9uIGZyYW1lIGFuZCBkb2N1bWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyMDAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBOVUxMIGNoZWNrcyB0byBzZWV0aW5nIG9i amVjdCB3aGVyZSBpdCdzIHJlcXVpcmVkLgorICAgICAgICBHZW5lcmFsbHkgV2ViQ29yZSBjaGVj a3MgTlVMTCB3aGljaCBtYXkgYmUgcmV0dXJuZWQgZnJvbSBzZXR0aW5nIG9iamVjdCBvYnRhaW5l ZAorICAgICAgICBvbiBmcmFtZSBvciBkb2N1bWVudCBidXQgaW4gc29tZSBjYXNlcyB0aGVzZSBh cmUgc2tpcHBlZC4gVGhlc2UgY2hlY2tzIGFyZSBub3QKKyAgICAgICAgbmVlZGVkIHRvIHNldHRp bmcncyBhY2Nlc3Mgb24gcGFnZSBvYmplY3QuCisKKyAgICAgICAgKiBodG1sL0hUTUxDYW52YXNF bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDYW52YXNFbGVtZW50OjpzaG91bGRB Y2NlbGVyYXRlKToKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnNjaGVkdWxlQXJjaGl2ZUxvYWQpOgorICAgICAg ICAqIGxvYWRlci9TdWJmcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdWJmcmFt ZUxvYWRlcjo6cmVxdWVzdFBsdWdpbik6CisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxp Y2F0aW9uQ2FjaGVHcm91cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hl R3JvdXA6OnNlbGVjdENhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVH cm91cDo6c2VsZWN0Q2FjaGVXaXRob3V0TWFuaWZlc3RVUkwpOgorICAgICAgICAqIHBhZ2UvRHJh Z0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6OmRyYWdn YWJsZU5vZGUpOgorICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VSZWxlYXNlRXZlbnQpOgorICAgICAgICAq IHBhZ2UvRm9jdXNDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJv bGxlcjo6YWR2YW5jZUZvY3VzSW5Eb2N1bWVudE9yZGVyKToKKyAgICAgICAgKiBwYWdlL0ZyYW1l LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lOjppbmplY3RVc2VyU2NyaXB0cyk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckZyYW1lU2V0OjpmbGF0dGVuRnJhbWVTZXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJJRnJhbWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVySUZyYW1lOjpmbGF0dGVuRnJh bWUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVCYWNraW5nKToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWN1 cmVUZXh0VGltZXI6OnJlc3RhcnRXaXRoTmV3VGV4dCk6CisKIDIwMTEtMTEtMDkgIFJha2VzaCBL TiAgPHJha2VzaC5rbkBtb3Rvcm9sYS5jb20+CiAKICAgICAgICAgTmVlZCBzdXBwb3J0IGZvciBk aXJuYW1lIGF0dHJpYnV0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2Fu dmFzRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNw cAppbmRleCAyZmM4Y2E4Li42MTUxMzdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxDYW52YXNFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52 YXNFbGVtZW50LmNwcApAQCAtNDE0LDE1ICs0MTQsMTUgQEAgQ1NTU3R5bGVTZWxlY3RvciogSFRN TENhbnZhc0VsZW1lbnQ6OnN0eWxlU2VsZWN0b3IoKQogCiBib29sIEhUTUxDYW52YXNFbGVtZW50 OjpzaG91bGRBY2NlbGVyYXRlKGNvbnN0IEludFNpemUmIHNpemUpIGNvbnN0CiB7CisgICAgU2V0 dGluZ3MqIHNldHRpbmdzID0gZG9jdW1lbnQoKS0+c2V0dGluZ3MoKTsKICNpZiBVU0UoSU9TVVJG QUNFX0NBTlZBU19CQUNLSU5HX1NUT1JFKQogICAgIFVOVVNFRF9QQVJBTShzaXplKTsKLSAgICBy ZXR1cm4gZG9jdW1lbnQoKS0+c2V0dGluZ3MoKS0+Y2FudmFzVXNlc0FjY2VsZXJhdGVkRHJhd2lu ZygpOworICAgIHJldHVybiBzZXR0aW5ncyAmJiBzZXR0aW5ncy0+Y2FudmFzVXNlc0FjY2VsZXJh dGVkRHJhd2luZygpOwogI2VsaWYgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICAgICBp ZiAobV9jb250ZXh0ICYmICFtX2NvbnRleHQtPmlzMmQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCi0gICAgU2V0dGluZ3MqIHNldHRpbmdzID0gZG9jdW1lbnQoKS0+c2V0dGluZ3MoKTsKLSAg ICBpZiAoIXNldHRpbmdzLT5hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZCgpKQorICAgIGlmICgh c2V0dGluZ3MgfHwgIXNldHRpbmdzLT5hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZCgpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBEbyBub3QgdXNlIGFjY2VsZXJhdGlvbiBmb3Ig c21hbGwgY2FudmFzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50 TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKaW5k ZXggZDUxY2ExNC4uZDBmZjE0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Rv Y3VtZW50TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2Fk ZXIuY3BwCkBAIC02NDAsNyArNjQwLDcgQEAgYm9vbCBEb2N1bWVudExvYWRlcjo6c2NoZWR1bGVB cmNoaXZlTG9hZChSZXNvdXJjZUxvYWRlciogbG9hZGVyLCBjb25zdCBSZXNvdXJjZVIKICNpZiBF TkFCTEUoV0VCX0FSQ0hJVkUpCiAgICAgY2FzZSBBcmNoaXZlOjpXZWJBcmNoaXZlOgogICAgICAg ICAvLyBXZWJBcmNoaXZlRGVidWdNb2RlIG1lYW5zIHdlIGZhaWwgbG9hZHMgaW5zdGVhZCBvZiB0 cnlpbmcgdG8gZmV0Y2ggdGhlbSBmcm9tIHRoZSBuZXR3b3JrIGlmIHRoZXkncmUgbm90IGluIHRo ZSBhcmNoaXZlLgotICAgICAgICByZXR1cm4gbV9mcmFtZS0+c2V0dGluZ3MoKS0+d2ViQXJjaGl2 ZURlYnVnTW9kZUVuYWJsZWQoKSAmJiBBcmNoaXZlRmFjdG9yeTo6aXNBcmNoaXZlTWltZVR5cGUo cmVzcG9uc2VNSU1FVHlwZSgpKTsKKyAgICAgICAgcmV0dXJuIG1fZnJhbWUtPnNldHRpbmdzICYm IG1fZnJhbWUtPnNldHRpbmdzKCktPndlYkFyY2hpdmVEZWJ1Z01vZGVFbmFibGVkKCkgJiYgQXJj aGl2ZUZhY3Rvcnk6OmlzQXJjaGl2ZU1pbWVUeXBlKHJlc3BvbnNlTUlNRVR5cGUoKSk7CiAjZW5k aWYKICNpZiBFTkFCTEUoTUhUTUwpCiAgICAgY2FzZSBBcmNoaXZlOjpNSFRNTDoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCmluZGV4IDQ3YzNlMTAuLjE1OTNmZTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcApAQCAtMTA5LDcgKzEwOSw3 IEBAIGJvb2wgU3ViZnJhbWVMb2FkZXI6OnJlcXVlc3RQbHVnaW4oSFRNTFBsdWdJbkltYWdlRWxl bWVudCogb3duZXJFbGVtZW50LCBjb25zdCBLCiAgICAgICAgICAvLyBhcyBvcHBvc2VkIHRvIHRo aXJkLXBhcnR5IGNvZGUgc3VjaCBhcyBGbGFzaC4gVGhlIHVzZXIgYWdlbnQgZGVjaWRlcyB3aGV0 aGVyIG9yIG5vdCB0aGV5IGFyZQogICAgICAgICAgLy8gcGVybWl0dGVkLCByYXRoZXIgdGhhbiBX ZWJLaXQuCiAgICAgICAgICAmJiAhTUlNRVR5cGVSZWdpc3RyeTo6aXNBcHBsaWNhdGlvblBsdWdp bk1JTUVUeXBlKG1pbWVUeXBlKSkKLSAgICAgICAgfHwgKCFzZXR0aW5ncy0+aXNKYXZhRW5hYmxl ZCgpICYmIE1JTUVUeXBlUmVnaXN0cnk6OmlzSmF2YUFwcGxldE1JTUVUeXBlKG1pbWVUeXBlKSkp CisgICAgICAgIHx8ICgoIXNldHRpbmdzIHx8ICFzZXR0aW5ncy0+aXNKYXZhRW5hYmxlZCgpKSAm JiBNSU1FVHlwZVJlZ2lzdHJ5Ojppc0phdmFBcHBsZXRNSU1FVHlwZShtaW1lVHlwZSkpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAobV9mcmFtZS0+ZG9jdW1lbnQoKSkgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVH cm91cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNo ZUdyb3VwLmNwcAppbmRleCBkNDUzZTkzLi4xZTQ5ZjI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcApAQCAt MTM4LDcgKzEzOCw3IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpzZWxlY3RDYWNoZShG cmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHBhc3NlZE1hbmlmZXN0CiB7CiAgICAgQVNTRVJUKGZy YW1lICYmIGZyYW1lLT5wYWdlKCkpOwogICAgIAotICAgIGlmICghZnJhbWUtPnNldHRpbmdzKCkt Pm9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpKQorICAgIGlmICghZnJhbWUtPnNl dHRpbmdzKCkgfHwgIWZyYW1lLT5zZXR0aW5ncygpLT5vZmZsaW5lV2ViQXBwbGljYXRpb25DYWNo ZUVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIERvY3VtZW50TG9hZGVyKiBk b2N1bWVudExvYWRlciA9IGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKTsKQEAgLTE5 Myw3ICsxOTMsNyBAQCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6c2VsZWN0Q2FjaGUoRnJh bWUqIGZyYW1lLCBjb25zdCBLVVJMJiBwYXNzZWRNYW5pZmVzdAogICAgICAgICByZXR1cm47CiAK ICAgICAvLyBEb24ndCBjaGFuZ2UgYW55dGhpbmcgb24gZGlzayBpZiBwcml2YXRlIGJyb3dzaW5n IGlzIGVuYWJsZWQuCi0gICAgaWYgKCFmcmFtZS0+c2V0dGluZ3MoKSB8fCBmcmFtZS0+c2V0dGlu Z3MoKS0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKSB7CisgICAgaWYgKGZyYW1lLT5zZXR0aW5n cygpLT5wcml2YXRlQnJvd3NpbmdFbmFibGVkKCkpIHsKICAgICAgICAgcG9zdExpc3RlbmVyVGFz ayhBcHBsaWNhdGlvbkNhY2hlSG9zdDo6Q0hFQ0tJTkdfRVZFTlQsIGRvY3VtZW50TG9hZGVyKTsK ICAgICAgICAgcG9zdExpc3RlbmVyVGFzayhBcHBsaWNhdGlvbkNhY2hlSG9zdDo6RVJST1JfRVZF TlQsIGRvY3VtZW50TG9hZGVyKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMjExLDcgKzIxMSw3IEBA IHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpzZWxlY3RDYWNoZShGcmFtZSogZnJhbWUsIGNv bnN0IEtVUkwmIHBhc3NlZE1hbmlmZXN0CiAKIHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpz ZWxlY3RDYWNoZVdpdGhvdXRNYW5pZmVzdFVSTChGcmFtZSogZnJhbWUpCiB7Ci0gICAgaWYgKCFm cmFtZS0+c2V0dGluZ3MoKS0+b2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKCkpCisg ICAgaWYgKCFmcmFtZS0+c2V0dGluZ3MoKSB8fCAhZnJhbWUtPnNldHRpbmdzKCktPm9mZmxpbmVX ZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBEb2N1 bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIgPSBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9h ZGVyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCmluZGV4IGRkMDYwM2Eu LjQwN2JmMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCkBAIC02MjEs NiArNjIxLDcgQEAgTm9kZSogRHJhZ0NvbnRyb2xsZXI6OmRyYWdnYWJsZU5vZGUoY29uc3QgRnJh bWUqIHNyYywgTm9kZSogc3RhcnROb2RlLCBjb25zdCBJbnQKICAgICAgICAgICAgIGlmIChkcmFn TW9kZSA9PSBEUkFHX0FVVE8pIHsKICAgICAgICAgICAgICAgICBpZiAoKG1fZHJhZ1NvdXJjZUFj dGlvbiAmIERyYWdTb3VyY2VBY3Rpb25JbWFnZSkKICAgICAgICAgICAgICAgICAgICAgJiYgbm9k ZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmltZ1RhZykKKyAgICAgICAgICAgICAgICAgICAgJiYg c3JjLT5zZXR0aW5ncygpCiAgICAgICAgICAgICAgICAgICAgICYmIHNyYy0+c2V0dGluZ3MoKS0+ bG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KCkpIHsKICAgICAgICAgICAgICAgICAgICAgc3RhdGUu bV9kcmFnVHlwZSA9IHN0YXRpY19jYXN0PERyYWdTb3VyY2VBY3Rpb24+KHN0YXRlLm1fZHJhZ1R5 cGUgfCBEcmFnU291cmNlQWN0aW9uSW1hZ2UpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm4g bm9kZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCA3NTQzYmVjLi5kYzQ3 MzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC03NjgsNyArNzY4LDcg QEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUmVsZWFzZUV2ZW50KGNvbnN0IE1vdXNl RXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMmIGUKICAgICAgICAgICAgICYmIGV2ZW50LmV2ZW50KCku YnV0dG9uKCkgIT0gUmlnaHRCdXR0b24pIHsKICAgICAgICAgVmlzaWJsZVNlbGVjdGlvbiBuZXdT ZWxlY3Rpb247CiAgICAgICAgIE5vZGUqIG5vZGUgPSB0YXJnZXROb2RlKGV2ZW50KTsKLSAgICAg ICAgYm9vbCBjYXJldEJyb3dzaW5nID0gbV9mcmFtZS0+c2V0dGluZ3MoKS0+Y2FyZXRCcm93c2lu Z0VuYWJsZWQoKTsKKyAgICAgICAgYm9vbCBjYXJldEJyb3dzaW5nID0gbV9mcmFtZS0+c2V0dGlu Z3MoKSAmJiBtX2ZyYW1lLT5zZXR0aW5ncygpLT5jYXJldEJyb3dzaW5nRW5hYmxlZCgpOwogICAg ICAgICBpZiAobm9kZSAmJiAoY2FyZXRCcm93c2luZyB8fCBub2RlLT5yZW5kZXJlcklzRWRpdGFi bGUoKSkgJiYgbm9kZS0+cmVuZGVyZXIoKSkgewogICAgICAgICAgICAgVmlzaWJsZVBvc2l0aW9u IHBvcyA9IG5vZGUtPnJlbmRlcmVyKCktPnBvc2l0aW9uRm9yUG9pbnQoZXZlbnQubG9jYWxQb2lu dCgpKTsKICAgICAgICAgICAgIG5ld1NlbGVjdGlvbiA9IFZpc2libGVTZWxlY3Rpb24ocG9zKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcAppbmRleCA4ZDg4MWEwLi5mNmVl MTUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCkBAIC0yMzksNyAr MjM5LDcgQEAgYm9vbCBGb2N1c0NvbnRyb2xsZXI6OmFkdmFuY2VGb2N1c0luRG9jdW1lbnRPcmRl cihGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEtleWIKIAogICAgIE5vZGUqIGN1cnJlbnROb2Rl ID0gZG9jdW1lbnQtPmZvY3VzZWROb2RlKCk7CiAgICAgLy8gRklYTUU6IE5vdCBxdWl0ZSBjb3Jy ZWN0IHdoZW4gaXQgY29tZXMgdG8gZm9jdXMgdHJhbnNpdGlvbnMgbGVhdmluZy9lbnRlcmluZyB0 aGUgV2ViVmlldyBpdHNlbGYKLSAgICBib29sIGNhcmV0QnJvd3NpbmcgPSBmb2N1c2VkT3JNYWlu RnJhbWUoKS0+c2V0dGluZ3MoKS0+Y2FyZXRCcm93c2luZ0VuYWJsZWQoKTsKKyAgICBib29sIGNh cmV0QnJvd3NpbmcgPSBmcmFtZS0+c2V0dGluZ3MoKSAmJiBmcmFtZS0+c2V0dGluZ3MoKS0+Y2Fy ZXRCcm93c2luZ0VuYWJsZWQoKTsKIAogICAgIGlmIChjYXJldEJyb3dzaW5nICYmICFjdXJyZW50 Tm9kZSkKICAgICAgICAgY3VycmVudE5vZGUgPSBmcmFtZS0+c2VsZWN0aW9uKCktPnN0YXJ0KCku ZGVwcmVjYXRlZE5vZGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKaW5kZXggYTg4ZjE4NS4uYzZmYjY0 OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9GcmFtZS5jcHAKQEAgLTU1Miw3ICs1NTIsNyBAQCB2b2lkIEZyYW1lOjpp bmplY3RVc2VyU2NyaXB0cyhVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSBpbmplY3Rpb25UaW1lKQog ICAgIGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobG9hZGVyKCktPnN0 YXRlTWFjaGluZSgpLT5jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgJiYgIXNldHRpbmdz KCktPnNob3VsZEluamVjdFVzZXJTY3JpcHRzSW5Jbml0aWFsRW1wdHlEb2N1bWVudCgpKQorICAg IGlmIChsb2FkZXIoKS0+c3RhdGVNYWNoaW5lKCktPmNyZWF0aW5nSW5pdGlhbEVtcHR5RG9jdW1l bnQoKSAmJiBzZXR0aW5ncygpICYmICFzZXR0aW5ncygpLT5zaG91bGRJbmplY3RVc2VyU2NyaXB0 c0luSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gV2Fs ayB0aGUgaGFzaHRhYmxlLiBJbmplY3QgYnkgd29ybGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVTZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckZyYW1lU2V0LmNwcAppbmRleCAwMGQ5YzBkLi4wNzRmM2VkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVTZXQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZVNldC5jcHAKQEAgLTY2Miw3ICs2NjIsNyBA QCB2b2lkIFJlbmRlckZyYW1lU2V0Ojpwb3NpdGlvbkZyYW1lc1dpdGhGbGF0dGVuaW5nKCkKIAog Ym9vbCBSZW5kZXJGcmFtZVNldDo6ZmxhdHRlbkZyYW1lU2V0KCkgY29uc3QKIHsKLSAgICByZXR1 cm4gZnJhbWUoKSAmJiBmcmFtZSgpLT5zZXR0aW5ncygpLT5mcmFtZUZsYXR0ZW5pbmdFbmFibGVk KCk7CisgICAgcmV0dXJuIGZyYW1lKCkgJiYgZnJhbWUoKS0+c2V0dGluZ3MoKSAmJiBmcmFtZSgp LT5zZXR0aW5ncygpLT5mcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCk7CiB9CiAKIHZvaWQgUmVuZGVy RnJhbWVTZXQ6OnN0YXJ0UmVzaXppbmcoR3JpZEF4aXMmIGF4aXMsIGludCBwb3NpdGlvbikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHAKaW5kZXggY2UwZjQzYi4uMWU1 MWQzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHAKQEAgLTk1 LDcgKzk1LDcgQEAgYm9vbCBSZW5kZXJJRnJhbWU6OmZsYXR0ZW5GcmFtZSgpCiAgICAgfQogCiAg ICAgRnJhbWUqIGZyYW1lID0gZWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKLSAgICBib29s IGVuYWJsZWQgPSBmcmFtZSAmJiBmcmFtZS0+c2V0dGluZ3MoKS0+ZnJhbWVGbGF0dGVuaW5nRW5h YmxlZCgpOworICAgIGJvb2wgZW5hYmxlZCA9IGZyYW1lICYmIGZyYW1lLT5zZXR0aW5ncygpICYm IGZyYW1lLT5zZXR0aW5ncygpLT5mcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCk7CiAKICAgICBpZiAo IWVuYWJsZWQgfHwgIWZyYW1lLT5wYWdlKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5k ZXggZjkzYTM5OS4uOWU2MDAwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTM2Myw3ICszNjMsOCBAQCBib29sIFJlbmRl ckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQmFja2luZyhSZW5kZXJMYXllciogbGF5ZXIsIENvbXBv c2l0aW5nQ2hhbmdlUgogICAgICAgICAgICAgbGF5ZXItPmVuc3VyZUJhY2tpbmcoKTsKIAogI2lm IFBMQVRGT1JNKE1BQykgJiYgVVNFKENBKQotICAgICAgICAgICAgaWYgKG1fcmVuZGVyVmlldy0+ ZG9jdW1lbnQoKS0+c2V0dGluZ3MoKS0+YWNjZWxlcmF0ZWREcmF3aW5nRW5hYmxlZCgpKQorICAg ICAgICAgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gbV9yZW5kZXJWaWV3LT5kb2N1bWVudCgpLT5z ZXR0aW5ncygpOworICAgICAgICAgICAgaWYgKHNldHRpbmdzICYmIHNldHRpbmdzLT5hY2NlbGVy YXRlZERyYXdpbmdFbmFibGVkKCkpCiAgICAgICAgICAgICAgICAgbGF5ZXItPmJhY2tpbmcoKS0+ Z3JhcGhpY3NMYXllcigpLT5zZXRBY2NlbGVyYXRlc0RyYXdpbmcodHJ1ZSk7CiAgICAgICAgICAg ICBlbHNlIGlmIChsYXllci0+cmVuZGVyZXIoKS0+aXNDYW52YXMoKSkgewogICAgICAgICAgICAg ICAgIEhUTUxDYW52YXNFbGVtZW50KiBjYW52YXMgPSBzdGF0aWNfY2FzdDxIVE1MQ2FudmFzRWxl bWVudCo+KGxheWVyLT5yZW5kZXJlcigpLT5ub2RlKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRleHQuY3BwCmluZGV4IDZlOTE0NDYuLjAxODVmZTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKQEAgLTY4LDcgKzY4LDggQEAgcHVibGljOgogICAgIHZv aWQgcmVzdGFydFdpdGhOZXdUZXh0KHVuc2lnbmVkIGxhc3RUeXBlZENoYXJhY3Rlck9mZnNldCkK ICAgICB7CiAgICAgICAgIG1fbGFzdFR5cGVkQ2hhcmFjdGVyT2Zmc2V0ID0gbGFzdFR5cGVkQ2hh cmFjdGVyT2Zmc2V0OwotICAgICAgICBzdGFydE9uZVNob3QobV9yZW5kZXJUZXh0LT5kb2N1bWVu dCgpLT5zZXR0aW5ncygpLT5wYXNzd29yZEVjaG9EdXJhdGlvbkluU2Vjb25kcygpKTsKKyAgICAg ICAgU2V0dGluZ3MqIHNldHRpbmdzID0gbV9yZW5kZXJUZXh0LT5kb2N1bWVudCgpLT5zZXR0aW5n cygpOworICAgICAgICBzdGFydE9uZVNob3Qoc2V0dGluZ3MgJiYgc2V0dGluZ3MtPnBhc3N3b3Jk RWNob0R1cmF0aW9uSW5TZWNvbmRzKCkpOwogICAgIH0KICAgICB2b2lkIGludmFsaWRhdGUoKSB7 IG1fbGFzdFR5cGVkQ2hhcmFjdGVyT2Zmc2V0ID0gLTE7IH0KICAgICB1bnNpZ25lZCBsYXN0VHlw ZWRDaGFyYWN0ZXJPZmZzZXQoKSB7IHJldHVybiBtX2xhc3RUeXBlZENoYXJhY3Rlck9mZnNldDsg fQo= 115133 2011-11-15 03:00:09 -0800 2012-01-10 02:43:58 -0800 updated patch settings_add_null_checks.patch text/plain 11269 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1OGMzZTJjLi4wYTVmNjI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkg QEAKKzIwMTEtMTEtMTUgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgQWRkIE5VTEwgY2hlY2tzIHRvIHNldHRpbmcgYWNjZXNzIHdoaWNo IGlzIG9idGFpbmVkIG9uIGZyYW1lIGFuZCBkb2N1bWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyMDAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBOVUxMIGNoZWNrcyB0byBzZWV0aW5nIG9i amVjdCB3aGVyZSBpdCdzIHJlcXVpcmVkLgorICAgICAgICBHZW5lcmFsbHkgV2ViQ29yZSBjaGVj a3MgTlVMTCB3aGljaCBtYXkgYmUgcmV0dXJuZWQgZnJvbSBzZXR0aW5nIG9iamVjdCBvYnRhaW5l ZAorICAgICAgICBvbiBmcmFtZSBvciBkb2N1bWVudCBidXQgaW4gc29tZSBjYXNlcyB0aGVzZSBh cmUgc2tpcHBlZC4gVGhlc2UgY2hlY2tzIGFyZSBub3QKKyAgICAgICAgbmVlZGVkIHRvIHNldHRp bmcncyBhY2Nlc3Mgb24gcGFnZSBvYmplY3QuCisKKyAgICAgICAgKiBodG1sL0hUTUxDYW52YXNF bGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDYW52YXNFbGVtZW50OjpzaG91bGRB Y2NlbGVyYXRlKToKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnNjaGVkdWxlQXJjaGl2ZUxvYWQpOgorICAgICAg ICAqIGxvYWRlci9TdWJmcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdWJmcmFt ZUxvYWRlcjo6cmVxdWVzdFBsdWdpbik6CisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxp Y2F0aW9uQ2FjaGVHcm91cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hl R3JvdXA6OnNlbGVjdENhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVH cm91cDo6c2VsZWN0Q2FjaGVXaXRob3V0TWFuaWZlc3RVUkwpOgorICAgICAgICAqIHBhZ2UvRHJh Z0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6OmRyYWdn YWJsZU5vZGUpOgorICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VSZWxlYXNlRXZlbnQpOgorICAgICAgICAq IHBhZ2UvRm9jdXNDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJv bGxlcjo6YWR2YW5jZUZvY3VzSW5Eb2N1bWVudE9yZGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyRnJhbWVTZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRnJhbWVTZXQ6OmZs YXR0ZW5GcmFtZVNldCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJJRnJhbWU6OmZsYXR0ZW5GcmFtZSk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUJhY2tpbmcpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyZVRleHRUaW1lcjo6cmVz dGFydFdpdGhOZXdUZXh0KToKKwogMjAxMS0xMS0xNSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW1Y4XSBGaXggaW5jb3JyZWN0IGhhbmRsaW5nIG9mIEphdmFT Y3JpcHQgcHJvcGVydGllcyBpbiBET01TdHJpbmdNYXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M Q2FudmFzRWxlbWVudC5jcHAKaW5kZXggMmZjOGNhOC4uNDkxNTIzNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKQEAgLTQxNiwxMyArNDE2LDEzIEBAIGJvb2wg SFRNTENhbnZhc0VsZW1lbnQ6OnNob3VsZEFjY2VsZXJhdGUoY29uc3QgSW50U2l6ZSYgc2l6ZSkg Y29uc3QKIHsKICNpZiBVU0UoSU9TVVJGQUNFX0NBTlZBU19CQUNLSU5HX1NUT1JFKQogICAgIFVO VVNFRF9QQVJBTShzaXplKTsKLSAgICByZXR1cm4gZG9jdW1lbnQoKS0+c2V0dGluZ3MoKS0+Y2Fu dmFzVXNlc0FjY2VsZXJhdGVkRHJhd2luZygpOworICAgIHJldHVybiBkb2N1bWVudCgpLT5zZXR0 aW5ncygpICYmIGRvY3VtZW50KCktPnNldHRpbmdzKCktPmNhbnZhc1VzZXNBY2NlbGVyYXRlZERy YXdpbmcoKTsKICNlbGlmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCiAgICAgaWYgKG1f Y29udGV4dCAmJiAhbV9jb250ZXh0LT5pczJkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAog ICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IGRvY3VtZW50KCktPnNldHRpbmdzKCk7Ci0gICAgaWYg KCFzZXR0aW5ncy0+YWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoKSkKKyAgICBpZiAoIXNldHRp bmdzIHx8ICFzZXR0aW5ncy0+YWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJsZWQoKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgLy8gRG8gbm90IHVzZSBhY2NlbGVyYXRpb24gZm9yIHNtYWxs IGNhbnZhcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IGQ1 MWNhMTQuLjgzODU0YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVu dExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNw cApAQCAtNjQwLDcgKzY0MCw3IEBAIGJvb2wgRG9jdW1lbnRMb2FkZXI6OnNjaGVkdWxlQXJjaGl2 ZUxvYWQoUmVzb3VyY2VMb2FkZXIqIGxvYWRlciwgY29uc3QgUmVzb3VyY2VSCiAjaWYgRU5BQkxF KFdFQl9BUkNISVZFKQogICAgIGNhc2UgQXJjaGl2ZTo6V2ViQXJjaGl2ZToKICAgICAgICAgLy8g V2ViQXJjaGl2ZURlYnVnTW9kZSBtZWFucyB3ZSBmYWlsIGxvYWRzIGluc3RlYWQgb2YgdHJ5aW5n IHRvIGZldGNoIHRoZW0gZnJvbSB0aGUgbmV0d29yayBpZiB0aGV5J3JlIG5vdCBpbiB0aGUgYXJj aGl2ZS4KLSAgICAgICAgcmV0dXJuIG1fZnJhbWUtPnNldHRpbmdzKCktPndlYkFyY2hpdmVEZWJ1 Z01vZGVFbmFibGVkKCkgJiYgQXJjaGl2ZUZhY3Rvcnk6OmlzQXJjaGl2ZU1pbWVUeXBlKHJlc3Bv bnNlTUlNRVR5cGUoKSk7CisgICAgICAgIHJldHVybiBtX2ZyYW1lLT5zZXR0aW5ncygpICYmIG1f ZnJhbWUtPnNldHRpbmdzKCktPndlYkFyY2hpdmVEZWJ1Z01vZGVFbmFibGVkKCkgJiYgQXJjaGl2 ZUZhY3Rvcnk6OmlzQXJjaGl2ZU1pbWVUeXBlKHJlc3BvbnNlTUlNRVR5cGUoKSk7CiAjZW5kaWYK ICNpZiBFTkFCTEUoTUhUTUwpCiAgICAgY2FzZSBBcmNoaXZlOjpNSFRNTDoKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCmluZGV4IDQ3YzNlMTAuLjE1OTNmZTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcApAQCAtMTA5LDcgKzEwOSw3IEBA IGJvb2wgU3ViZnJhbWVMb2FkZXI6OnJlcXVlc3RQbHVnaW4oSFRNTFBsdWdJbkltYWdlRWxlbWVu dCogb3duZXJFbGVtZW50LCBjb25zdCBLCiAgICAgICAgICAvLyBhcyBvcHBvc2VkIHRvIHRoaXJk LXBhcnR5IGNvZGUgc3VjaCBhcyBGbGFzaC4gVGhlIHVzZXIgYWdlbnQgZGVjaWRlcyB3aGV0aGVy IG9yIG5vdCB0aGV5IGFyZQogICAgICAgICAgLy8gcGVybWl0dGVkLCByYXRoZXIgdGhhbiBXZWJL aXQuCiAgICAgICAgICAmJiAhTUlNRVR5cGVSZWdpc3RyeTo6aXNBcHBsaWNhdGlvblBsdWdpbk1J TUVUeXBlKG1pbWVUeXBlKSkKLSAgICAgICAgfHwgKCFzZXR0aW5ncy0+aXNKYXZhRW5hYmxlZCgp ICYmIE1JTUVUeXBlUmVnaXN0cnk6OmlzSmF2YUFwcGxldE1JTUVUeXBlKG1pbWVUeXBlKSkpCisg ICAgICAgIHx8ICgoIXNldHRpbmdzIHx8ICFzZXR0aW5ncy0+aXNKYXZhRW5hYmxlZCgpKSAmJiBN SU1FVHlwZVJlZ2lzdHJ5Ojppc0phdmFBcHBsZXRNSU1FVHlwZShtaW1lVHlwZSkpKQogICAgICAg ICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAobV9mcmFtZS0+ZG9jdW1lbnQoKSkgewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2FjaGVHcm91 cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdy b3VwLmNwcAppbmRleCBkNDUzZTkzLi4xZTQ5ZjI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcApAQCAtMTM4 LDcgKzEzOCw3IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpzZWxlY3RDYWNoZShGcmFt ZSogZnJhbWUsIGNvbnN0IEtVUkwmIHBhc3NlZE1hbmlmZXN0CiB7CiAgICAgQVNTRVJUKGZyYW1l ICYmIGZyYW1lLT5wYWdlKCkpOwogICAgIAotICAgIGlmICghZnJhbWUtPnNldHRpbmdzKCktPm9m ZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpKQorICAgIGlmICghZnJhbWUtPnNldHRp bmdzKCkgfHwgIWZyYW1lLT5zZXR0aW5ncygpLT5vZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZUVu YWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIERvY3VtZW50TG9hZGVyKiBkb2N1 bWVudExvYWRlciA9IGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKTsKQEAgLTE5Myw3 ICsxOTMsNyBAQCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6c2VsZWN0Q2FjaGUoRnJhbWUq IGZyYW1lLCBjb25zdCBLVVJMJiBwYXNzZWRNYW5pZmVzdAogICAgICAgICByZXR1cm47CiAKICAg ICAvLyBEb24ndCBjaGFuZ2UgYW55dGhpbmcgb24gZGlzayBpZiBwcml2YXRlIGJyb3dzaW5nIGlz IGVuYWJsZWQuCi0gICAgaWYgKCFmcmFtZS0+c2V0dGluZ3MoKSB8fCBmcmFtZS0+c2V0dGluZ3Mo KS0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKSB7CisgICAgaWYgKGZyYW1lLT5zZXR0aW5ncygp LT5wcml2YXRlQnJvd3NpbmdFbmFibGVkKCkpIHsKICAgICAgICAgcG9zdExpc3RlbmVyVGFzayhB cHBsaWNhdGlvbkNhY2hlSG9zdDo6Q0hFQ0tJTkdfRVZFTlQsIGRvY3VtZW50TG9hZGVyKTsKICAg ICAgICAgcG9zdExpc3RlbmVyVGFzayhBcHBsaWNhdGlvbkNhY2hlSG9zdDo6RVJST1JfRVZFTlQs IGRvY3VtZW50TG9hZGVyKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMjExLDcgKzIxMSw3IEBAIHZv aWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpzZWxlY3RDYWNoZShGcmFtZSogZnJhbWUsIGNvbnN0 IEtVUkwmIHBhc3NlZE1hbmlmZXN0CiAKIHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpzZWxl Y3RDYWNoZVdpdGhvdXRNYW5pZmVzdFVSTChGcmFtZSogZnJhbWUpCiB7Ci0gICAgaWYgKCFmcmFt ZS0+c2V0dGluZ3MoKS0+b2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKCkpCisgICAg aWYgKCFmcmFtZS0+c2V0dGluZ3MoKSB8fCAhZnJhbWUtPnNldHRpbmdzKCktPm9mZmxpbmVXZWJB cHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBEb2N1bWVu dExvYWRlciogZG9jdW1lbnRMb2FkZXIgPSBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVy KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RyYWdDb250cm9sbGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCmluZGV4IGRkMDYwM2EuLjQw N2JmMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIuY3BwCkBAIC02MjEsNiAr NjIxLDcgQEAgTm9kZSogRHJhZ0NvbnRyb2xsZXI6OmRyYWdnYWJsZU5vZGUoY29uc3QgRnJhbWUq IHNyYywgTm9kZSogc3RhcnROb2RlLCBjb25zdCBJbnQKICAgICAgICAgICAgIGlmIChkcmFnTW9k ZSA9PSBEUkFHX0FVVE8pIHsKICAgICAgICAgICAgICAgICBpZiAoKG1fZHJhZ1NvdXJjZUFjdGlv biAmIERyYWdTb3VyY2VBY3Rpb25JbWFnZSkKICAgICAgICAgICAgICAgICAgICAgJiYgbm9kZS0+ aGFzVGFnTmFtZShIVE1MTmFtZXM6OmltZ1RhZykKKyAgICAgICAgICAgICAgICAgICAgJiYgc3Jj LT5zZXR0aW5ncygpCiAgICAgICAgICAgICAgICAgICAgICYmIHNyYy0+c2V0dGluZ3MoKS0+bG9h ZHNJbWFnZXNBdXRvbWF0aWNhbGx5KCkpIHsKICAgICAgICAgICAgICAgICAgICAgc3RhdGUubV9k cmFnVHlwZSA9IHN0YXRpY19jYXN0PERyYWdTb3VyY2VBY3Rpb24+KHN0YXRlLm1fZHJhZ1R5cGUg fCBEcmFnU291cmNlQWN0aW9uSW1hZ2UpOwogICAgICAgICAgICAgICAgICAgICByZXR1cm4gbm9k ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCA4MzlmNjIwLi40YzgyZWVl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC03NjgsNyArNzY4LDcgQEAg Ym9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUmVsZWFzZUV2ZW50KGNvbnN0IE1vdXNlRXZl bnRXaXRoSGl0VGVzdFJlc3VsdHMmIGUKICAgICAgICAgICAgICYmIGV2ZW50LmV2ZW50KCkuYnV0 dG9uKCkgIT0gUmlnaHRCdXR0b24pIHsKICAgICAgICAgVmlzaWJsZVNlbGVjdGlvbiBuZXdTZWxl Y3Rpb247CiAgICAgICAgIE5vZGUqIG5vZGUgPSB0YXJnZXROb2RlKGV2ZW50KTsKLSAgICAgICAg Ym9vbCBjYXJldEJyb3dzaW5nID0gbV9mcmFtZS0+c2V0dGluZ3MoKS0+Y2FyZXRCcm93c2luZ0Vu YWJsZWQoKTsKKyAgICAgICAgYm9vbCBjYXJldEJyb3dzaW5nID0gbV9mcmFtZS0+c2V0dGluZ3Mo KSAmJiBtX2ZyYW1lLT5zZXR0aW5ncygpLT5jYXJldEJyb3dzaW5nRW5hYmxlZCgpOwogICAgICAg ICBpZiAobm9kZSAmJiAoY2FyZXRCcm93c2luZyB8fCBub2RlLT5yZW5kZXJlcklzRWRpdGFibGUo KSkgJiYgbm9kZS0+cmVuZGVyZXIoKSkgewogICAgICAgICAgICAgVmlzaWJsZVBvc2l0aW9uIHBv cyA9IG5vZGUtPnJlbmRlcmVyKCktPnBvc2l0aW9uRm9yUG9pbnQoZXZlbnQubG9jYWxQb2ludCgp KTsKICAgICAgICAgICAgIG5ld1NlbGVjdGlvbiA9IFZpc2libGVTZWxlY3Rpb24ocG9zKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcAppbmRleCA4ZDg4MWEwLi5mNmVlMTUy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCkBAIC0yMzksNyArMjM5 LDcgQEAgYm9vbCBGb2N1c0NvbnRyb2xsZXI6OmFkdmFuY2VGb2N1c0luRG9jdW1lbnRPcmRlcihG b2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEtleWIKIAogICAgIE5vZGUqIGN1cnJlbnROb2RlID0g ZG9jdW1lbnQtPmZvY3VzZWROb2RlKCk7CiAgICAgLy8gRklYTUU6IE5vdCBxdWl0ZSBjb3JyZWN0 IHdoZW4gaXQgY29tZXMgdG8gZm9jdXMgdHJhbnNpdGlvbnMgbGVhdmluZy9lbnRlcmluZyB0aGUg V2ViVmlldyBpdHNlbGYKLSAgICBib29sIGNhcmV0QnJvd3NpbmcgPSBmb2N1c2VkT3JNYWluRnJh bWUoKS0+c2V0dGluZ3MoKS0+Y2FyZXRCcm93c2luZ0VuYWJsZWQoKTsKKyAgICBib29sIGNhcmV0 QnJvd3NpbmcgPSBmcmFtZS0+c2V0dGluZ3MoKSAmJiBmcmFtZS0+c2V0dGluZ3MoKS0+Y2FyZXRC cm93c2luZ0VuYWJsZWQoKTsKIAogICAgIGlmIChjYXJldEJyb3dzaW5nICYmICFjdXJyZW50Tm9k ZSkKICAgICAgICAgY3VycmVudE5vZGUgPSBmcmFtZS0+c2VsZWN0aW9uKCktPnN0YXJ0KCkuZGVw cmVjYXRlZE5vZGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJGcmFtZVNldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVTZXQu Y3BwCmluZGV4IDAwZDljMGQuLjA3NGYzZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGcmFtZVNldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZyYW1lU2V0LmNwcApAQCAtNjYyLDcgKzY2Miw3IEBAIHZvaWQgUmVuZGVyRnJhbWVT ZXQ6OnBvc2l0aW9uRnJhbWVzV2l0aEZsYXR0ZW5pbmcoKQogCiBib29sIFJlbmRlckZyYW1lU2V0 OjpmbGF0dGVuRnJhbWVTZXQoKSBjb25zdAogewotICAgIHJldHVybiBmcmFtZSgpICYmIGZyYW1l KCktPnNldHRpbmdzKCktPmZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoKTsKKyAgICByZXR1cm4gZnJh bWUoKSAmJiBmcmFtZSgpLT5zZXR0aW5ncygpICYmIGZyYW1lKCktPnNldHRpbmdzKCktPmZyYW1l RmxhdHRlbmluZ0VuYWJsZWQoKTsKIH0KIAogdm9pZCBSZW5kZXJGcmFtZVNldDo6c3RhcnRSZXNp emluZyhHcmlkQXhpcyYgYXhpcywgaW50IHBvc2l0aW9uKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVySUZyYW1lLmNwcAppbmRleCBjZTBmNDNiLi4xZTUxZDM4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcApAQCAtOTUsNyArOTUsNyBAQCBib29sIFJl bmRlcklGcmFtZTo6ZmxhdHRlbkZyYW1lKCkKICAgICB9CiAKICAgICBGcmFtZSogZnJhbWUgPSBl bGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgpOwotICAgIGJvb2wgZW5hYmxlZCA9IGZyYW1lICYm IGZyYW1lLT5zZXR0aW5ncygpLT5mcmFtZUZsYXR0ZW5pbmdFbmFibGVkKCk7CisgICAgYm9vbCBl bmFibGVkID0gZnJhbWUgJiYgZnJhbWUtPnNldHRpbmdzKCkgJiYgZnJhbWUtPnNldHRpbmdzKCkt PmZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoKTsKIAogICAgIGlmICghZW5hYmxlZCB8fCAhZnJhbWUt PnBhZ2UoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCBmOTNhMzk5Li45ZTYwMDBi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcApAQCAtMzYzLDcgKzM2Myw4IEBAIGJvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1 cGRhdGVCYWNraW5nKFJlbmRlckxheWVyKiBsYXllciwgQ29tcG9zaXRpbmdDaGFuZ2VSCiAgICAg ICAgICAgICBsYXllci0+ZW5zdXJlQmFja2luZygpOwogCiAjaWYgUExBVEZPUk0oTUFDKSAmJiBV U0UoQ0EpCi0gICAgICAgICAgICBpZiAobV9yZW5kZXJWaWV3LT5kb2N1bWVudCgpLT5zZXR0aW5n cygpLT5hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKCkpCisgICAgICAgICAgICBTZXR0aW5ncyog c2V0dGluZ3MgPSBtX3JlbmRlclZpZXctPmRvY3VtZW50KCktPnNldHRpbmdzKCk7CisgICAgICAg ICAgICBpZiAoc2V0dGluZ3MgJiYgc2V0dGluZ3MtPmFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQo KSkKICAgICAgICAgICAgICAgICBsYXllci0+YmFja2luZygpLT5ncmFwaGljc0xheWVyKCktPnNl dEFjY2VsZXJhdGVzRHJhd2luZyh0cnVlKTsKICAgICAgICAgICAgIGVsc2UgaWYgKGxheWVyLT5y ZW5kZXJlcigpLT5pc0NhbnZhcygpKSB7CiAgICAgICAgICAgICAgICAgSFRNTENhbnZhc0VsZW1l bnQqIGNhbnZhcyA9IHN0YXRpY19jYXN0PEhUTUxDYW52YXNFbGVtZW50Kj4obGF5ZXItPnJlbmRl cmVyKCktPm5vZGUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5k ZXggNmU5MTQ0Ni4uMDE4NWZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0 LmNwcApAQCAtNjgsNyArNjgsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCByZXN0YXJ0V2l0aE5ld1Rl eHQodW5zaWduZWQgbGFzdFR5cGVkQ2hhcmFjdGVyT2Zmc2V0KQogICAgIHsKICAgICAgICAgbV9s YXN0VHlwZWRDaGFyYWN0ZXJPZmZzZXQgPSBsYXN0VHlwZWRDaGFyYWN0ZXJPZmZzZXQ7Ci0gICAg ICAgIHN0YXJ0T25lU2hvdChtX3JlbmRlclRleHQtPmRvY3VtZW50KCktPnNldHRpbmdzKCktPnBh c3N3b3JkRWNob0R1cmF0aW9uSW5TZWNvbmRzKCkpOworICAgICAgICBTZXR0aW5ncyogc2V0dGlu Z3MgPSBtX3JlbmRlclRleHQtPmRvY3VtZW50KCktPnNldHRpbmdzKCk7CisgICAgICAgIHN0YXJ0 T25lU2hvdChzZXR0aW5ncyAmJiBzZXR0aW5ncy0+cGFzc3dvcmRFY2hvRHVyYXRpb25JblNlY29u ZHMoKSk7CiAgICAgfQogICAgIHZvaWQgaW52YWxpZGF0ZSgpIHsgbV9sYXN0VHlwZWRDaGFyYWN0 ZXJPZmZzZXQgPSAtMTsgfQogICAgIHVuc2lnbmVkIGxhc3RUeXBlZENoYXJhY3Rlck9mZnNldCgp IHsgcmV0dXJuIG1fbGFzdFR5cGVkQ2hhcmFjdGVyT2Zmc2V0OyB9Cg== 121815 2012-01-10 02:43:58 -0800 2012-01-10 03:43:46 -0800 updated patch settings_add_null_checks.patch text/plain 11229 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MTc3NWU1Li44NTY5OTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkg QEAKKzIwMTItMDEtMTAgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgQWRkIE5VTEwgY2hlY2tzIHRvIHNldHRpbmcgYWNjZXNzIG9idGFp bmVkIG9uIGZyYW1lIGFuZCBkb2N1bWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTcyMDAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkcyBOVUxMIGNoZWNrcyB0byBzZWV0aW5nIG9iamVjdCB3aGVy ZSBpdCdzIHJlcXVpcmVkLgorICAgICAgICBHZW5lcmFsbHkgV2ViQ29yZSBjaGVja3MgTlVMTCB3 aGljaCBtYXkgYmUgcmV0dXJuZWQgZnJvbSBzZXR0aW5nIG9iamVjdCBvYnRhaW5lZAorICAgICAg ICBvbiBmcmFtZSBvciBkb2N1bWVudCBidXQgaW4gc29tZSBjYXNlcyB0aGVzZSBhcmUgc2tpcHBl ZC4gVGhlc2UgY2hlY2tzIGFyZSBub3QKKyAgICAgICAgbmVlZGVkIHRvIHNldHRpbmcncyBhY2Nl c3Mgb24gcGFnZSBvYmplY3QuCisKKyAgICAgICAgKiBodG1sL0hUTUxDYW52YXNFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDYW52YXNFbGVtZW50OjpzaG91bGRBY2NlbGVyYXRl KToKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnRMb2FkZXI6OnNjaGVkdWxlQXJjaGl2ZUxvYWQpOgorICAgICAgICAqIGxvYWRl ci9TdWJmcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdWJmcmFtZUxvYWRlcjo6 cmVxdWVzdFBsdWdpbik6CisgICAgICAgICogbG9hZGVyL2FwcGNhY2hlL0FwcGxpY2F0aW9uQ2Fj aGVHcm91cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OnNl bGVjdENhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6c2Vs ZWN0Q2FjaGVXaXRob3V0TWFuaWZlc3RVUkwpOgorICAgICAgICAqIHBhZ2UvRHJhZ0NvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0NvbnRyb2xsZXI6OmRyYWdnYWJsZU5vZGUp OgorICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2 ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VSZWxlYXNlRXZlbnQpOgorICAgICAgICAqIHBhZ2UvRm9j dXNDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzQ29udHJvbGxlcjo6YWR2 YW5jZUZvY3VzSW5Eb2N1bWVudE9yZGVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRnJh bWVTZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRnJhbWVTZXQ6OmZsYXR0ZW5GcmFt ZVNldCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJJRnJhbWU6OmZsYXR0ZW5GcmFtZSk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll ckNvbXBvc2l0b3I6OnVwZGF0ZUJhY2tpbmcpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyZVRleHRUaW1lcjo6cmVzdGFydFdpdGhO ZXdUZXh0KToKKwogMjAxMi0wMS0wOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBn bWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEwNDUwNy4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKaW5kZXggMWJmOTBhYy4uNjgx ZmI5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKQEAgLTQy MywxMyArNDIzLDEzIEBAIGJvb2wgSFRNTENhbnZhc0VsZW1lbnQ6OnNob3VsZEFjY2VsZXJhdGUo Y29uc3QgSW50U2l6ZSYgc2l6ZSkgY29uc3QKIHsKICNpZiBVU0UoSU9TVVJGQUNFX0NBTlZBU19C QUNLSU5HX1NUT1JFKQogICAgIFVOVVNFRF9QQVJBTShzaXplKTsKLSAgICByZXR1cm4gZG9jdW1l bnQoKS0+c2V0dGluZ3MoKS0+Y2FudmFzVXNlc0FjY2VsZXJhdGVkRHJhd2luZygpOworICAgIHJl dHVybiBkb2N1bWVudCgpLT5zZXR0aW5ncygpICYmIGRvY3VtZW50KCktPnNldHRpbmdzKCktPmNh bnZhc1VzZXNBY2NlbGVyYXRlZERyYXdpbmcoKTsKICNlbGlmIEVOQUJMRShBQ0NFTEVSQVRFRF8y RF9DQU5WQVMpCiAgICAgaWYgKG1fY29udGV4dCAmJiAhbV9jb250ZXh0LT5pczJkKCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIAogICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IGRvY3VtZW50KCkt PnNldHRpbmdzKCk7Ci0gICAgaWYgKCFzZXR0aW5ncy0+YWNjZWxlcmF0ZWQyZENhbnZhc0VuYWJs ZWQoKSkKKyAgICBpZiAoIXNldHRpbmdzIHx8ICFzZXR0aW5ncy0+YWNjZWxlcmF0ZWQyZENhbnZh c0VuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gRG8gbm90IHVzZSBh Y2NlbGVyYXRpb24gZm9yIHNtYWxsIGNhbnZhcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1l bnRMb2FkZXIuY3BwCmluZGV4IGRlNDdjMmEuLmZlODcyM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL0RvY3VtZW50TG9hZGVyLmNwcApAQCAtNjQwLDcgKzY0MCw3IEBAIGJvb2wgRG9jdW1lbnRM b2FkZXI6OnNjaGVkdWxlQXJjaGl2ZUxvYWQoUmVzb3VyY2VMb2FkZXIqIGxvYWRlciwgY29uc3Qg UmVzb3VyY2VSCiAjaWYgRU5BQkxFKFdFQl9BUkNISVZFKQogICAgIGNhc2UgQXJjaGl2ZTo6V2Vi QXJjaGl2ZToKICAgICAgICAgLy8gV2ViQXJjaGl2ZURlYnVnTW9kZSBtZWFucyB3ZSBmYWlsIGxv YWRzIGluc3RlYWQgb2YgdHJ5aW5nIHRvIGZldGNoIHRoZW0gZnJvbSB0aGUgbmV0d29yayBpZiB0 aGV5J3JlIG5vdCBpbiB0aGUgYXJjaGl2ZS4KLSAgICAgICAgcmV0dXJuIG1fZnJhbWUtPnNldHRp bmdzKCktPndlYkFyY2hpdmVEZWJ1Z01vZGVFbmFibGVkKCkgJiYgQXJjaGl2ZUZhY3Rvcnk6Omlz QXJjaGl2ZU1pbWVUeXBlKHJlc3BvbnNlTUlNRVR5cGUoKSk7CisgICAgICAgIHJldHVybiBtX2Zy YW1lLT5zZXR0aW5ncygpICYmIG1fZnJhbWUtPnNldHRpbmdzKCktPndlYkFyY2hpdmVEZWJ1Z01v ZGVFbmFibGVkKCkgJiYgQXJjaGl2ZUZhY3Rvcnk6OmlzQXJjaGl2ZU1pbWVUeXBlKHJlc3BvbnNl TUlNRVR5cGUoKSk7CiAjZW5kaWYKICNpZiBFTkFCTEUoTUhUTUwpCiAgICAgY2FzZSBBcmNoaXZl OjpNSFRNTDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3BwCmluZGV4IDIz NmM3MjguLmFmMGQwNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFt ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNw cApAQCAtMTA5LDcgKzEwOSw3IEBAIGJvb2wgU3ViZnJhbWVMb2FkZXI6OnJlcXVlc3RQbHVnaW4o SFRNTFBsdWdJbkltYWdlRWxlbWVudCogb3duZXJFbGVtZW50LCBjb25zdCBLCiAgICAgICAgICAv LyBhcyBvcHBvc2VkIHRvIHRoaXJkLXBhcnR5IGNvZGUgc3VjaCBhcyBGbGFzaC4gVGhlIHVzZXIg YWdlbnQgZGVjaWRlcyB3aGV0aGVyIG9yIG5vdCB0aGV5IGFyZQogICAgICAgICAgLy8gcGVybWl0 dGVkLCByYXRoZXIgdGhhbiBXZWJLaXQuCiAgICAgICAgICAmJiAhTUlNRVR5cGVSZWdpc3RyeTo6 aXNBcHBsaWNhdGlvblBsdWdpbk1JTUVUeXBlKG1pbWVUeXBlKSkKLSAgICAgICAgfHwgKCFzZXR0 aW5ncy0+aXNKYXZhRW5hYmxlZCgpICYmIE1JTUVUeXBlUmVnaXN0cnk6OmlzSmF2YUFwcGxldE1J TUVUeXBlKG1pbWVUeXBlKSkpCisgICAgICAgIHx8ICgoIXNldHRpbmdzIHx8ICFzZXR0aW5ncy0+ aXNKYXZhRW5hYmxlZCgpKSAmJiBNSU1FVHlwZVJlZ2lzdHJ5Ojppc0phdmFBcHBsZXRNSU1FVHlw ZShtaW1lVHlwZSkpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBpZiAobV9mcmFtZS0+ ZG9jdW1lbnQoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FwcGNhY2hl L0FwcGxpY2F0aW9uQ2FjaGVHcm91cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2Fj aGUvQXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcAppbmRleCAwNGMyZjI5Li5lYzJkNzFiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNoZUdy b3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25D YWNoZUdyb3VwLmNwcApAQCAtMTM4LDcgKzEzOCw3IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUdy b3VwOjpzZWxlY3RDYWNoZShGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHBhc3NlZE1hbmlmZXN0 CiB7CiAgICAgQVNTRVJUKGZyYW1lICYmIGZyYW1lLT5wYWdlKCkpOwogICAgIAotICAgIGlmICgh ZnJhbWUtPnNldHRpbmdzKCktPm9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpKQor ICAgIGlmICghZnJhbWUtPnNldHRpbmdzKCkgfHwgIWZyYW1lLT5zZXR0aW5ncygpLT5vZmZsaW5l V2ViQXBwbGljYXRpb25DYWNoZUVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAg IERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1l bnRMb2FkZXIoKTsKQEAgLTE5Myw3ICsxOTMsNyBAQCB2b2lkIEFwcGxpY2F0aW9uQ2FjaGVHcm91 cDo6c2VsZWN0Q2FjaGUoRnJhbWUqIGZyYW1lLCBjb25zdCBLVVJMJiBwYXNzZWRNYW5pZmVzdAog ICAgICAgICByZXR1cm47CiAKICAgICAvLyBEb24ndCBjaGFuZ2UgYW55dGhpbmcgb24gZGlzayBp ZiBwcml2YXRlIGJyb3dzaW5nIGlzIGVuYWJsZWQuCi0gICAgaWYgKCFmcmFtZS0+c2V0dGluZ3Mo KSB8fCBmcmFtZS0+c2V0dGluZ3MoKS0+cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpKSB7CisgICAg aWYgKGZyYW1lLT5zZXR0aW5ncygpLT5wcml2YXRlQnJvd3NpbmdFbmFibGVkKCkpIHsKICAgICAg ICAgcG9zdExpc3RlbmVyVGFzayhBcHBsaWNhdGlvbkNhY2hlSG9zdDo6Q0hFQ0tJTkdfRVZFTlQs IGRvY3VtZW50TG9hZGVyKTsKICAgICAgICAgcG9zdExpc3RlbmVyVGFzayhBcHBsaWNhdGlvbkNh Y2hlSG9zdDo6RVJST1JfRVZFTlQsIGRvY3VtZW50TG9hZGVyKTsKICAgICAgICAgcmV0dXJuOwpA QCAtMjExLDcgKzIxMSw3IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3VwOjpzZWxlY3RDYWNo ZShGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHBhc3NlZE1hbmlmZXN0CiAKIHZvaWQgQXBwbGlj YXRpb25DYWNoZUdyb3VwOjpzZWxlY3RDYWNoZVdpdGhvdXRNYW5pZmVzdFVSTChGcmFtZSogZnJh bWUpCiB7Ci0gICAgaWYgKCFmcmFtZS0+c2V0dGluZ3MoKS0+b2ZmbGluZVdlYkFwcGxpY2F0aW9u Q2FjaGVFbmFibGVkKCkpCisgICAgaWYgKCFmcmFtZS0+c2V0dGluZ3MoKSB8fCAhZnJhbWUtPnNl dHRpbmdzKCktPm9mZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpKQogICAgICAgICBy ZXR1cm47CiAKICAgICBEb2N1bWVudExvYWRlciogZG9jdW1lbnRMb2FkZXIgPSBmcmFtZS0+bG9h ZGVyKCktPmRvY3VtZW50TG9hZGVyKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0RyYWdDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRyb2xsZXIu Y3BwCmluZGV4IDc5NDI1NjIuLjVkODM0ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRHJhZ0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRHJhZ0NvbnRy b2xsZXIuY3BwCkBAIC02MjYsNiArNjI2LDcgQEAgTm9kZSogRHJhZ0NvbnRyb2xsZXI6OmRyYWdn YWJsZU5vZGUoY29uc3QgRnJhbWUqIHNyYywgTm9kZSogc3RhcnROb2RlLCBjb25zdCBJbnQKICAg ICAgICAgICAgIGlmIChkcmFnTW9kZSA9PSBEUkFHX0FVVE8pIHsKICAgICAgICAgICAgICAgICBp ZiAoKG1fZHJhZ1NvdXJjZUFjdGlvbiAmIERyYWdTb3VyY2VBY3Rpb25JbWFnZSkKICAgICAgICAg ICAgICAgICAgICAgJiYgbm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmltZ1RhZykKKyAgICAg ICAgICAgICAgICAgICAgJiYgc3JjLT5zZXR0aW5ncygpCiAgICAgICAgICAgICAgICAgICAgICYm IHNyYy0+c2V0dGluZ3MoKS0+bG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KCkpIHsKICAgICAgICAg ICAgICAgICAgICAgc3RhdGUubV9kcmFnVHlwZSA9IHN0YXRpY19jYXN0PERyYWdTb3VyY2VBY3Rp b24+KHN0YXRlLm1fZHJhZ1R5cGUgfCBEcmFnU291cmNlQWN0aW9uSW1hZ2UpOwogICAgICAgICAg ICAgICAgICAgICByZXR1cm4gbm9kZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcApp bmRleCBjMjFlYjdlLi4xZjQ3MDUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2 ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3Bw CkBAIC03NzEsNyArNzcxLDcgQEAgYm9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZU1vdXNlUmVsZWFz ZUV2ZW50KGNvbnN0IE1vdXNlRXZlbnRXaXRoSGl0VGVzdFJlc3VsdHMmIGUKICAgICAgICAgICAg ICYmIGV2ZW50LmV2ZW50KCkuYnV0dG9uKCkgIT0gUmlnaHRCdXR0b24pIHsKICAgICAgICAgVmlz aWJsZVNlbGVjdGlvbiBuZXdTZWxlY3Rpb247CiAgICAgICAgIE5vZGUqIG5vZGUgPSB0YXJnZXRO b2RlKGV2ZW50KTsKLSAgICAgICAgYm9vbCBjYXJldEJyb3dzaW5nID0gbV9mcmFtZS0+c2V0dGlu Z3MoKS0+Y2FyZXRCcm93c2luZ0VuYWJsZWQoKTsKKyAgICAgICAgYm9vbCBjYXJldEJyb3dzaW5n ID0gbV9mcmFtZS0+c2V0dGluZ3MoKSAmJiBtX2ZyYW1lLT5zZXR0aW5ncygpLT5jYXJldEJyb3dz aW5nRW5hYmxlZCgpOwogICAgICAgICBpZiAobm9kZSAmJiAoY2FyZXRCcm93c2luZyB8fCBub2Rl LT5yZW5kZXJlcklzRWRpdGFibGUoKSkgJiYgbm9kZS0+cmVuZGVyZXIoKSkgewogICAgICAgICAg ICAgVmlzaWJsZVBvc2l0aW9uIHBvcyA9IG5vZGUtPnJlbmRlcmVyKCktPnBvc2l0aW9uRm9yUG9p bnQoZXZlbnQubG9jYWxQb2ludCgpKTsKICAgICAgICAgICAgIG5ld1NlbGVjdGlvbiA9IFZpc2li bGVTZWxlY3Rpb24ocG9zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXND b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcApp bmRleCA0ZjU4ZGYzLi5iMThkNGQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zv Y3VzQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xs ZXIuY3BwCkBAIC0yNDQsNyArMjQ0LDcgQEAgYm9vbCBGb2N1c0NvbnRyb2xsZXI6OmFkdmFuY2VG b2N1c0luRG9jdW1lbnRPcmRlcihGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEtleWIKIAogICAg IE5vZGUqIGN1cnJlbnROb2RlID0gZG9jdW1lbnQtPmZvY3VzZWROb2RlKCk7CiAgICAgLy8gRklY TUU6IE5vdCBxdWl0ZSBjb3JyZWN0IHdoZW4gaXQgY29tZXMgdG8gZm9jdXMgdHJhbnNpdGlvbnMg bGVhdmluZy9lbnRlcmluZyB0aGUgV2ViVmlldyBpdHNlbGYKLSAgICBib29sIGNhcmV0QnJvd3Np bmcgPSBmb2N1c2VkT3JNYWluRnJhbWUoKS0+c2V0dGluZ3MoKS0+Y2FyZXRCcm93c2luZ0VuYWJs ZWQoKTsKKyAgICBib29sIGNhcmV0QnJvd3NpbmcgPSBmcmFtZS0+c2V0dGluZ3MoKSAmJiBmcmFt ZS0+c2V0dGluZ3MoKS0+Y2FyZXRCcm93c2luZ0VuYWJsZWQoKTsKIAogICAgIGlmIChjYXJldEJy b3dzaW5nICYmICFjdXJyZW50Tm9kZSkKICAgICAgICAgY3VycmVudE5vZGUgPSBmcmFtZS0+c2Vs ZWN0aW9uKCktPnN0YXJ0KCkuZGVwcmVjYXRlZE5vZGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZVNldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRnJhbWVTZXQuY3BwCmluZGV4IDAwZDljMGQuLjA3NGYzZWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZVNldC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0LmNwcApAQCAtNjYyLDcgKzY2Miw3 IEBAIHZvaWQgUmVuZGVyRnJhbWVTZXQ6OnBvc2l0aW9uRnJhbWVzV2l0aEZsYXR0ZW5pbmcoKQog CiBib29sIFJlbmRlckZyYW1lU2V0OjpmbGF0dGVuRnJhbWVTZXQoKSBjb25zdAogewotICAgIHJl dHVybiBmcmFtZSgpICYmIGZyYW1lKCktPnNldHRpbmdzKCktPmZyYW1lRmxhdHRlbmluZ0VuYWJs ZWQoKTsKKyAgICByZXR1cm4gZnJhbWUoKSAmJiBmcmFtZSgpLT5zZXR0aW5ncygpICYmIGZyYW1l KCktPnNldHRpbmdzKCktPmZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoKTsKIH0KIAogdm9pZCBSZW5k ZXJGcmFtZVNldDo6c3RhcnRSZXNpemluZyhHcmlkQXhpcyYgYXhpcywgaW50IHBvc2l0aW9uKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklGcmFtZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcAppbmRleCA3ZTg3MzgzLi43 NDNlM2Y0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1l LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcApAQCAt OTUsNyArOTUsNyBAQCBib29sIFJlbmRlcklGcmFtZTo6ZmxhdHRlbkZyYW1lKCkKICAgICB9CiAK ICAgICBGcmFtZSogZnJhbWUgPSBlbGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgpOwotICAgIGJv b2wgZW5hYmxlZCA9IGZyYW1lICYmIGZyYW1lLT5zZXR0aW5ncygpLT5mcmFtZUZsYXR0ZW5pbmdF bmFibGVkKCk7CisgICAgYm9vbCBlbmFibGVkID0gZnJhbWUgJiYgZnJhbWUtPnNldHRpbmdzKCkg JiYgZnJhbWUtPnNldHRpbmdzKCktPmZyYW1lRmxhdHRlbmluZ0VuYWJsZWQoKTsKIAogICAgIGlm ICghZW5hYmxlZCB8fCAhZnJhbWUtPnBhZ2UoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApp bmRleCAyZjk4ZTE4Li4yNGFlODVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMzY4LDcgKzM2OCw4IEBAIGJvb2wgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVCYWNraW5nKFJlbmRlckxheWVyKiBsYXllciwgQ29t cG9zaXRpbmdDaGFuZ2VSCiAgICAgICAgICAgICBsYXllci0+ZW5zdXJlQmFja2luZygpOwogCiAj aWYgUExBVEZPUk0oTUFDKSAmJiBVU0UoQ0EpCi0gICAgICAgICAgICBpZiAobV9yZW5kZXJWaWV3 LT5kb2N1bWVudCgpLT5zZXR0aW5ncygpLT5hY2NlbGVyYXRlZERyYXdpbmdFbmFibGVkKCkpCisg ICAgICAgICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBtX3JlbmRlclZpZXctPmRvY3VtZW50KCkt PnNldHRpbmdzKCk7CisgICAgICAgICAgICBpZiAoc2V0dGluZ3MgJiYgc2V0dGluZ3MtPmFjY2Vs ZXJhdGVkRHJhd2luZ0VuYWJsZWQoKSkKICAgICAgICAgICAgICAgICBsYXllci0+YmFja2luZygp LT5ncmFwaGljc0xheWVyKCktPnNldEFjY2VsZXJhdGVzRHJhd2luZyh0cnVlKTsKICAgICAgICAg ICAgIGVsc2UgaWYgKGxheWVyLT5yZW5kZXJlcigpLT5pc0NhbnZhcygpKSB7CiAgICAgICAgICAg ICAgICAgSFRNTENhbnZhc0VsZW1lbnQqIGNhbnZhcyA9IHN0YXRpY19jYXN0PEhUTUxDYW52YXNF bGVtZW50Kj4obGF5ZXItPnJlbmRlcmVyKCktPm5vZGUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggODE3NzUwMy4uMGUxMjEwNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcApAQCAtNjgsNyArNjgsOCBAQCBwdWJsaWM6CiAgICAg dm9pZCByZXN0YXJ0V2l0aE5ld1RleHQodW5zaWduZWQgbGFzdFR5cGVkQ2hhcmFjdGVyT2Zmc2V0 KQogICAgIHsKICAgICAgICAgbV9sYXN0VHlwZWRDaGFyYWN0ZXJPZmZzZXQgPSBsYXN0VHlwZWRD aGFyYWN0ZXJPZmZzZXQ7Ci0gICAgICAgIHN0YXJ0T25lU2hvdChtX3JlbmRlclRleHQtPmRvY3Vt ZW50KCktPnNldHRpbmdzKCktPnBhc3N3b3JkRWNob0R1cmF0aW9uSW5TZWNvbmRzKCkpOworICAg ICAgICBpZiAoU2V0dGluZ3MqIHNldHRpbmdzID0gbV9yZW5kZXJUZXh0LT5kb2N1bWVudCgpLT5z ZXR0aW5ncygpKQorICAgICAgICAgICAgc3RhcnRPbmVTaG90KHNldHRpbmdzLT5wYXNzd29yZEVj aG9EdXJhdGlvbkluU2Vjb25kcygpKTsKICAgICB9CiAgICAgdm9pZCBpbnZhbGlkYXRlKCkgeyBt X2xhc3RUeXBlZENoYXJhY3Rlck9mZnNldCA9IC0xOyB9CiAgICAgdW5zaWduZWQgbGFzdFR5cGVk Q2hhcmFjdGVyT2Zmc2V0KCkgeyByZXR1cm4gbV9sYXN0VHlwZWRDaGFyYWN0ZXJPZmZzZXQ7IH0K 121823 2012-01-10 03:43:46 -0800 2012-01-10 04:20:05 -0800 patch for landing settings_add_null_checks.patch text/plain 11228 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MTc3NWU1Li44NTY5OTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkg QEAKKzIwMTItMDEtMTAgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgQWRkIE5VTEwgY2hlY2tzIHRvIHNldHRpbmcgYWNjZXNzIG9idGFp bmVkIG9uIGZyYW1lIGFuZCBkb2N1bWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTcyMDAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBL bGluZy4KKworICAgICAgICBBZGRzIE5VTEwgY2hlY2tzIHRvIHNldHRpbmcgb2JqZWN0IHdoZXJl IGl0J3MgcmVxdWlyZWQuCisgICAgICAgIEdlbmVyYWxseSBXZWJDb3JlIGNoZWNrcyBOVUxMIHdo aWNoIG1heSBiZSByZXR1cm5lZCBmcm9tIHNldHRpbmcgb2JqZWN0IG9idGFpbmVkCisgICAgICAg IG9uIGZyYW1lIG9yIGRvY3VtZW50IGJ1dCBpbiBzb21lIGNhc2VzIHRoZXNlIGFyZSBza2lwcGVk LiBUaGVzZSBjaGVja3MgYXJlIG5vdAorICAgICAgICBuZWVkZWQgdG8gc2V0dGluZydzIGFjY2Vz cyBvbiBwYWdlIG9iamVjdC4KKworICAgICAgICAqIGh0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SFRNTENhbnZhc0VsZW1lbnQ6OnNob3VsZEFjY2VsZXJhdGUp OgorICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpEb2N1bWVudExvYWRlcjo6c2NoZWR1bGVBcmNoaXZlTG9hZCk6CisgICAgICAgICogbG9hZGVy L1N1YmZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN1YmZyYW1lTG9hZGVyOjpy ZXF1ZXN0UGx1Z2luKToKKyAgICAgICAgKiBsb2FkZXIvYXBwY2FjaGUvQXBwbGljYXRpb25DYWNo ZUdyb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVHcm91cDo6c2Vs ZWN0Q2FjaGUpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZUdyb3VwOjpzZWxl Y3RDYWNoZVdpdGhvdXRNYW5pZmVzdFVSTCk6CisgICAgICAgICogcGFnZS9EcmFnQ29udHJvbGxl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEcmFnQ29udHJvbGxlcjo6ZHJhZ2dhYmxlTm9kZSk6 CisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RXZl bnRIYW5kbGVyOjpoYW5kbGVNb3VzZVJlbGVhc2VFdmVudCk6CisgICAgICAgICogcGFnZS9Gb2N1 c0NvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNDb250cm9sbGVyOjphZHZh bmNlRm9jdXNJbkRvY3VtZW50T3JkZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGcmFt ZVNldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGcmFtZVNldDo6ZmxhdHRlbkZyYW1l U2V0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlcklGcmFtZTo6ZmxhdHRlbkZyYW1lKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy Q29tcG9zaXRvcjo6dXBkYXRlQmFja2luZyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRl eHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJlVGV4dFRpbWVyOjpyZXN0YXJ0V2l0aE5l d1RleHQpOgorCiAyMDEyLTAxLTA5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdt YWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTA0NTA3LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAppbmRleCAxYmY5MGFjLi42ODFm YjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcApAQCAtNDIz LDEzICs0MjMsMTMgQEAgYm9vbCBIVE1MQ2FudmFzRWxlbWVudDo6c2hvdWxkQWNjZWxlcmF0ZShj b25zdCBJbnRTaXplJiBzaXplKSBjb25zdAogewogI2lmIFVTRShJT1NVUkZBQ0VfQ0FOVkFTX0JB Q0tJTkdfU1RPUkUpCiAgICAgVU5VU0VEX1BBUkFNKHNpemUpOwotICAgIHJldHVybiBkb2N1bWVu dCgpLT5zZXR0aW5ncygpLT5jYW52YXNVc2VzQWNjZWxlcmF0ZWREcmF3aW5nKCk7CisgICAgcmV0 dXJuIGRvY3VtZW50KCktPnNldHRpbmdzKCkgJiYgZG9jdW1lbnQoKS0+c2V0dGluZ3MoKS0+Y2Fu dmFzVXNlc0FjY2VsZXJhdGVkRHJhd2luZygpOwogI2VsaWYgRU5BQkxFKEFDQ0VMRVJBVEVEXzJE X0NBTlZBUykKICAgICBpZiAobV9jb250ZXh0ICYmICFtX2NvbnRleHQtPmlzMmQoKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gZG9jdW1lbnQoKS0+ c2V0dGluZ3MoKTsKLSAgICBpZiAoIXNldHRpbmdzLT5hY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxl ZCgpKQorICAgIGlmICghc2V0dGluZ3MgfHwgIXNldHRpbmdzLT5hY2NlbGVyYXRlZDJkQ2FudmFz RW5hYmxlZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBEbyBub3QgdXNlIGFj Y2VsZXJhdGlvbiBmb3Igc21hbGwgY2FudmFzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVu dExvYWRlci5jcHAKaW5kZXggZGU0N2MyYS4uZmU4NzIzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC02NDAsNyArNjQwLDcgQEAgYm9vbCBEb2N1bWVudExv YWRlcjo6c2NoZWR1bGVBcmNoaXZlTG9hZChSZXNvdXJjZUxvYWRlciogbG9hZGVyLCBjb25zdCBS ZXNvdXJjZVIKICNpZiBFTkFCTEUoV0VCX0FSQ0hJVkUpCiAgICAgY2FzZSBBcmNoaXZlOjpXZWJB cmNoaXZlOgogICAgICAgICAvLyBXZWJBcmNoaXZlRGVidWdNb2RlIG1lYW5zIHdlIGZhaWwgbG9h ZHMgaW5zdGVhZCBvZiB0cnlpbmcgdG8gZmV0Y2ggdGhlbSBmcm9tIHRoZSBuZXR3b3JrIGlmIHRo ZXkncmUgbm90IGluIHRoZSBhcmNoaXZlLgotICAgICAgICByZXR1cm4gbV9mcmFtZS0+c2V0dGlu Z3MoKS0+d2ViQXJjaGl2ZURlYnVnTW9kZUVuYWJsZWQoKSAmJiBBcmNoaXZlRmFjdG9yeTo6aXNB cmNoaXZlTWltZVR5cGUocmVzcG9uc2VNSU1FVHlwZSgpKTsKKyAgICAgICAgcmV0dXJuIG1fZnJh bWUtPnNldHRpbmdzKCkgJiYgbV9mcmFtZS0+c2V0dGluZ3MoKS0+d2ViQXJjaGl2ZURlYnVnTW9k ZUVuYWJsZWQoKSAmJiBBcmNoaXZlRmFjdG9yeTo6aXNBcmNoaXZlTWltZVR5cGUocmVzcG9uc2VN SU1FVHlwZSgpKTsKICNlbmRpZgogI2lmIEVOQUJMRShNSFRNTCkKICAgICBjYXNlIEFyY2hpdmU6 Ok1IVE1MOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRlci5jcHAKaW5kZXggMjM2 YzcyOC4uYWYwZDA3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YmZyYW1l TG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3ViZnJhbWVMb2FkZXIuY3Bw CkBAIC0xMDksNyArMTA5LDcgQEAgYm9vbCBTdWJmcmFtZUxvYWRlcjo6cmVxdWVzdFBsdWdpbihI VE1MUGx1Z0luSW1hZ2VFbGVtZW50KiBvd25lckVsZW1lbnQsIGNvbnN0IEsKICAgICAgICAgIC8v IGFzIG9wcG9zZWQgdG8gdGhpcmQtcGFydHkgY29kZSBzdWNoIGFzIEZsYXNoLiBUaGUgdXNlciBh Z2VudCBkZWNpZGVzIHdoZXRoZXIgb3Igbm90IHRoZXkgYXJlCiAgICAgICAgICAvLyBwZXJtaXR0 ZWQsIHJhdGhlciB0aGFuIFdlYktpdC4KICAgICAgICAgICYmICFNSU1FVHlwZVJlZ2lzdHJ5Ojpp c0FwcGxpY2F0aW9uUGx1Z2luTUlNRVR5cGUobWltZVR5cGUpKQotICAgICAgICB8fCAoIXNldHRp bmdzLT5pc0phdmFFbmFibGVkKCkgJiYgTUlNRVR5cGVSZWdpc3RyeTo6aXNKYXZhQXBwbGV0TUlN RVR5cGUobWltZVR5cGUpKSkKKyAgICAgICAgfHwgKCghc2V0dGluZ3MgfHwgIXNldHRpbmdzLT5p c0phdmFFbmFibGVkKCkpICYmIE1JTUVUeXBlUmVnaXN0cnk6OmlzSmF2YUFwcGxldE1JTUVUeXBl KG1pbWVUeXBlKSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChtX2ZyYW1lLT5k b2N1bWVudCgpKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXBwY2FjaGUv QXBwbGljYXRpb25DYWNoZUdyb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNo ZS9BcHBsaWNhdGlvbkNhY2hlR3JvdXAuY3BwCmluZGV4IDA0YzJmMjkuLmVjMmQ3MWIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNhY2hlR3Jv dXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcHBjYWNoZS9BcHBsaWNhdGlvbkNh Y2hlR3JvdXAuY3BwCkBAIC0xMzgsNyArMTM4LDcgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlR3Jv dXA6OnNlbGVjdENhY2hlKEZyYW1lKiBmcmFtZSwgY29uc3QgS1VSTCYgcGFzc2VkTWFuaWZlc3QK IHsKICAgICBBU1NFUlQoZnJhbWUgJiYgZnJhbWUtPnBhZ2UoKSk7CiAgICAgCi0gICAgaWYgKCFm cmFtZS0+c2V0dGluZ3MoKS0+b2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKCkpCisg ICAgaWYgKCFmcmFtZS0+c2V0dGluZ3MoKSB8fCAhZnJhbWUtPnNldHRpbmdzKCktPm9mZmxpbmVX ZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZCgpKQogICAgICAgICByZXR1cm47CiAgICAgCiAgICAg RG9jdW1lbnRMb2FkZXIqIGRvY3VtZW50TG9hZGVyID0gZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVu dExvYWRlcigpOwpAQCAtMTkzLDcgKzE5Myw3IEBAIHZvaWQgQXBwbGljYXRpb25DYWNoZUdyb3Vw OjpzZWxlY3RDYWNoZShGcmFtZSogZnJhbWUsIGNvbnN0IEtVUkwmIHBhc3NlZE1hbmlmZXN0CiAg ICAgICAgIHJldHVybjsKIAogICAgIC8vIERvbid0IGNoYW5nZSBhbnl0aGluZyBvbiBkaXNrIGlm IHByaXZhdGUgYnJvd3NpbmcgaXMgZW5hYmxlZC4KLSAgICBpZiAoIWZyYW1lLT5zZXR0aW5ncygp IHx8IGZyYW1lLT5zZXR0aW5ncygpLT5wcml2YXRlQnJvd3NpbmdFbmFibGVkKCkpIHsKKyAgICBp ZiAoZnJhbWUtPnNldHRpbmdzKCktPnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKSkgewogICAgICAg ICBwb3N0TGlzdGVuZXJUYXNrKEFwcGxpY2F0aW9uQ2FjaGVIb3N0OjpDSEVDS0lOR19FVkVOVCwg ZG9jdW1lbnRMb2FkZXIpOwogICAgICAgICBwb3N0TGlzdGVuZXJUYXNrKEFwcGxpY2F0aW9uQ2Fj aGVIb3N0OjpFUlJPUl9FVkVOVCwgZG9jdW1lbnRMb2FkZXIpOwogICAgICAgICByZXR1cm47CkBA IC0yMTEsNyArMjExLDcgQEAgdm9pZCBBcHBsaWNhdGlvbkNhY2hlR3JvdXA6OnNlbGVjdENhY2hl KEZyYW1lKiBmcmFtZSwgY29uc3QgS1VSTCYgcGFzc2VkTWFuaWZlc3QKIAogdm9pZCBBcHBsaWNh dGlvbkNhY2hlR3JvdXA6OnNlbGVjdENhY2hlV2l0aG91dE1hbmlmZXN0VVJMKEZyYW1lKiBmcmFt ZSkKIHsKLSAgICBpZiAoIWZyYW1lLT5zZXR0aW5ncygpLT5vZmZsaW5lV2ViQXBwbGljYXRpb25D YWNoZUVuYWJsZWQoKSkKKyAgICBpZiAoIWZyYW1lLT5zZXR0aW5ncygpIHx8ICFmcmFtZS0+c2V0 dGluZ3MoKS0+b2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2FjaGVFbmFibGVkKCkpCiAgICAgICAgIHJl dHVybjsKIAogICAgIERvY3VtZW50TG9hZGVyKiBkb2N1bWVudExvYWRlciA9IGZyYW1lLT5sb2Fk ZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RHJhZ0NvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJvbGxlci5j cHAKaW5kZXggNzk0MjU2Mi4uNWQ4MzRkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9EcmFnQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EcmFnQ29udHJv bGxlci5jcHAKQEAgLTYyNiw2ICs2MjYsNyBAQCBOb2RlKiBEcmFnQ29udHJvbGxlcjo6ZHJhZ2dh YmxlTm9kZShjb25zdCBGcmFtZSogc3JjLCBOb2RlKiBzdGFydE5vZGUsIGNvbnN0IEludAogICAg ICAgICAgICAgaWYgKGRyYWdNb2RlID09IERSQUdfQVVUTykgewogICAgICAgICAgICAgICAgIGlm ICgobV9kcmFnU291cmNlQWN0aW9uICYgRHJhZ1NvdXJjZUFjdGlvbkltYWdlKQogICAgICAgICAg ICAgICAgICAgICAmJiBub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6aW1nVGFnKQorICAgICAg ICAgICAgICAgICAgICAmJiBzcmMtPnNldHRpbmdzKCkKICAgICAgICAgICAgICAgICAgICAgJiYg c3JjLT5zZXR0aW5ncygpLT5sb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkoKSkgewogICAgICAgICAg ICAgICAgICAgICBzdGF0ZS5tX2RyYWdUeXBlID0gc3RhdGljX2Nhc3Q8RHJhZ1NvdXJjZUFjdGlv bj4oc3RhdGUubV9kcmFnVHlwZSB8IERyYWdTb3VyY2VBY3Rpb25JbWFnZSk7CiAgICAgICAgICAg ICAgICAgICAgIHJldHVybiBub2RlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9F dmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmlu ZGV4IGMyMWViN2UuLjFmNDcwNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZl bnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAK QEAgLTc3MSw3ICs3NzEsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6aGFuZGxlTW91c2VSZWxlYXNl RXZlbnQoY29uc3QgTW91c2VFdmVudFdpdGhIaXRUZXN0UmVzdWx0cyYgZQogICAgICAgICAgICAg JiYgZXZlbnQuZXZlbnQoKS5idXR0b24oKSAhPSBSaWdodEJ1dHRvbikgewogICAgICAgICBWaXNp YmxlU2VsZWN0aW9uIG5ld1NlbGVjdGlvbjsKICAgICAgICAgTm9kZSogbm9kZSA9IHRhcmdldE5v ZGUoZXZlbnQpOwotICAgICAgICBib29sIGNhcmV0QnJvd3NpbmcgPSBtX2ZyYW1lLT5zZXR0aW5n cygpLT5jYXJldEJyb3dzaW5nRW5hYmxlZCgpOworICAgICAgICBib29sIGNhcmV0QnJvd3Npbmcg PSBtX2ZyYW1lLT5zZXR0aW5ncygpICYmIG1fZnJhbWUtPnNldHRpbmdzKCktPmNhcmV0QnJvd3Np bmdFbmFibGVkKCk7CiAgICAgICAgIGlmIChub2RlICYmIChjYXJldEJyb3dzaW5nIHx8IG5vZGUt PnJlbmRlcmVySXNFZGl0YWJsZSgpKSAmJiBub2RlLT5yZW5kZXJlcigpKSB7CiAgICAgICAgICAg ICBWaXNpYmxlUG9zaXRpb24gcG9zID0gbm9kZS0+cmVuZGVyZXIoKS0+cG9zaXRpb25Gb3JQb2lu dChldmVudC5sb2NhbFBvaW50KCkpOwogICAgICAgICAgICAgbmV3U2VsZWN0aW9uID0gVmlzaWJs ZVNlbGVjdGlvbihwb3MpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0Nv bnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCmlu ZGV4IDRmNThkZjMuLmIxOGQ0ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9j dXNDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxl ci5jcHAKQEAgLTI0NCw3ICsyNDQsNyBAQCBib29sIEZvY3VzQ29udHJvbGxlcjo6YWR2YW5jZUZv Y3VzSW5Eb2N1bWVudE9yZGVyKEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiwgS2V5YgogCiAgICAg Tm9kZSogY3VycmVudE5vZGUgPSBkb2N1bWVudC0+Zm9jdXNlZE5vZGUoKTsKICAgICAvLyBGSVhN RTogTm90IHF1aXRlIGNvcnJlY3Qgd2hlbiBpdCBjb21lcyB0byBmb2N1cyB0cmFuc2l0aW9ucyBs ZWF2aW5nL2VudGVyaW5nIHRoZSBXZWJWaWV3IGl0c2VsZgotICAgIGJvb2wgY2FyZXRCcm93c2lu ZyA9IGZvY3VzZWRPck1haW5GcmFtZSgpLT5zZXR0aW5ncygpLT5jYXJldEJyb3dzaW5nRW5hYmxl ZCgpOworICAgIGJvb2wgY2FyZXRCcm93c2luZyA9IGZyYW1lLT5zZXR0aW5ncygpICYmIGZyYW1l LT5zZXR0aW5ncygpLT5jYXJldEJyb3dzaW5nRW5hYmxlZCgpOwogCiAgICAgaWYgKGNhcmV0QnJv d3NpbmcgJiYgIWN1cnJlbnROb2RlKQogICAgICAgICBjdXJyZW50Tm9kZSA9IGZyYW1lLT5zZWxl Y3Rpb24oKS0+c3RhcnQoKS5kZXByZWNhdGVkTm9kZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJGcmFtZVNldC5jcHAKaW5kZXggMDBkOWMwZC4uMDc0ZjNlZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lU2V0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWVTZXQuY3BwCkBAIC02NjIsNyArNjYyLDcg QEAgdm9pZCBSZW5kZXJGcmFtZVNldDo6cG9zaXRpb25GcmFtZXNXaXRoRmxhdHRlbmluZygpCiAK IGJvb2wgUmVuZGVyRnJhbWVTZXQ6OmZsYXR0ZW5GcmFtZVNldCgpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIGZyYW1lKCkgJiYgZnJhbWUoKS0+c2V0dGluZ3MoKS0+ZnJhbWVGbGF0dGVuaW5nRW5hYmxl ZCgpOworICAgIHJldHVybiBmcmFtZSgpICYmIGZyYW1lKCktPnNldHRpbmdzKCkgJiYgZnJhbWUo KS0+c2V0dGluZ3MoKS0+ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpOwogfQogCiB2b2lkIFJlbmRl ckZyYW1lU2V0OjpzdGFydFJlc2l6aW5nKEdyaWRBeGlzJiBheGlzLCBpbnQgcG9zaXRpb24pCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySUZyYW1lLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuY3BwCmluZGV4IDdlODczODMuLjc0 M2UzZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJRnJhbWUuY3BwCkBAIC05 NSw3ICs5NSw3IEBAIGJvb2wgUmVuZGVySUZyYW1lOjpmbGF0dGVuRnJhbWUoKQogICAgIH0KIAog ICAgIEZyYW1lKiBmcmFtZSA9IGVsZW1lbnQtPmRvY3VtZW50KCktPmZyYW1lKCk7Ci0gICAgYm9v bCBlbmFibGVkID0gZnJhbWUgJiYgZnJhbWUtPnNldHRpbmdzKCktPmZyYW1lRmxhdHRlbmluZ0Vu YWJsZWQoKTsKKyAgICBib29sIGVuYWJsZWQgPSBmcmFtZSAmJiBmcmFtZS0+c2V0dGluZ3MoKSAm JiBmcmFtZS0+c2V0dGluZ3MoKS0+ZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpOwogCiAgICAgaWYg KCFlbmFibGVkIHx8ICFmcmFtZS0+cGFnZSgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmlu ZGV4IDJmOThlMTguLjI0YWU4NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0zNjgsNyArMzY4LDggQEAgYm9vbCBSZW5k ZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUJhY2tpbmcoUmVuZGVyTGF5ZXIqIGxheWVyLCBDb21w b3NpdGluZ0NoYW5nZVIKICAgICAgICAgICAgIGxheWVyLT5lbnN1cmVCYWNraW5nKCk7CiAKICNp ZiBQTEFURk9STShNQUMpICYmIFVTRShDQSkKLSAgICAgICAgICAgIGlmIChtX3JlbmRlclZpZXct PmRvY3VtZW50KCktPnNldHRpbmdzKCktPmFjY2VsZXJhdGVkRHJhd2luZ0VuYWJsZWQoKSkKKyAg ICAgICAgICAgIFNldHRpbmdzKiBzZXR0aW5ncyA9IG1fcmVuZGVyVmlldy0+ZG9jdW1lbnQoKS0+ c2V0dGluZ3MoKTsKKyAgICAgICAgICAgIGlmIChzZXR0aW5ncyAmJiBzZXR0aW5ncy0+YWNjZWxl cmF0ZWREcmF3aW5nRW5hYmxlZCgpKQogICAgICAgICAgICAgICAgIGxheWVyLT5iYWNraW5nKCkt PmdyYXBoaWNzTGF5ZXIoKS0+c2V0QWNjZWxlcmF0ZXNEcmF3aW5nKHRydWUpOwogICAgICAgICAg ICAgZWxzZSBpZiAobGF5ZXItPnJlbmRlcmVyKCktPmlzQ2FudmFzKCkpIHsKICAgICAgICAgICAg ICAgICBIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzID0gc3RhdGljX2Nhc3Q8SFRNTENhbnZhc0Vs ZW1lbnQqPihsYXllci0+cmVuZGVyZXIoKS0+bm9kZSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUZXh0LmNwcAppbmRleCA4MTc3NTAzLi4wZTEyMTA2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCkBAIC02OCw3ICs2OCw4IEBAIHB1YmxpYzoKICAgICB2 b2lkIHJlc3RhcnRXaXRoTmV3VGV4dCh1bnNpZ25lZCBsYXN0VHlwZWRDaGFyYWN0ZXJPZmZzZXQp CiAgICAgewogICAgICAgICBtX2xhc3RUeXBlZENoYXJhY3Rlck9mZnNldCA9IGxhc3RUeXBlZENo YXJhY3Rlck9mZnNldDsKLSAgICAgICAgc3RhcnRPbmVTaG90KG1fcmVuZGVyVGV4dC0+ZG9jdW1l bnQoKS0+c2V0dGluZ3MoKS0+cGFzc3dvcmRFY2hvRHVyYXRpb25JblNlY29uZHMoKSk7CisgICAg ICAgIGlmIChTZXR0aW5ncyogc2V0dGluZ3MgPSBtX3JlbmRlclRleHQtPmRvY3VtZW50KCktPnNl dHRpbmdzKCkpCisgICAgICAgICAgICBzdGFydE9uZVNob3Qoc2V0dGluZ3MtPnBhc3N3b3JkRWNo b0R1cmF0aW9uSW5TZWNvbmRzKCkpOwogICAgIH0KICAgICB2b2lkIGludmFsaWRhdGUoKSB7IG1f bGFzdFR5cGVkQ2hhcmFjdGVyT2Zmc2V0ID0gLTE7IH0KICAgICB1bnNpZ25lZCBsYXN0VHlwZWRD aGFyYWN0ZXJPZmZzZXQoKSB7IHJldHVybiBtX2xhc3RUeXBlZENoYXJhY3Rlck9mZnNldDsgfQo=