105352 2012-12-18 14:42:39 -0800 String improvements in geolocation and notifications modules 2013-01-07 15:59:23 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck joepeck oldest_to_newest 794074 0 joepeck 2012-12-18 14:42:39 -0800 While reading through the code for Modules/geolocation and Modules/notifications I noticed some string improvements that could be made. Patch to follow. 794076 1 180032 joepeck 2012-12-18 14:46:18 -0800 Created attachment 180032 [PATCH] Proposed Fix 794793 2 180032 joepeck 2012-12-19 10:36:46 -0800 Comment on attachment 180032 [PATCH] Proposed Fix Given a recent patch with similar changes caused crashes I didn't see I'm going to r- and hold off on this until I can test it further. 800536 3 180032 joepeck 2013-01-04 12:48:58 -0800 Comment on attachment 180032 [PATCH] Proposed Fix Back to r? the earlier concerns do not matter here. 801770 4 joepeck 2013-01-07 15:59:23 -0800 Landed r139005: <http://trac.webkit.org/changeset/139005> 180032 2012-12-18 14:46:18 -0800 2013-01-05 15:28:04 -0800 [PATCH] Proposed Fix proposed-change-1.patch text/plain 7926 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ZDgyOTA4Li5mZDVmOGJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTItMTItMTggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwor ICAgICAgICBTdHJpbmcgaW1wcm92ZW1lbnRzIGluIGdlb2xvY2F0aW9uIGFuZCBub3RpZmljYXRp b25zIG1vZHVsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwNTM1MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogTW9kdWxlcy9nZW9sb2NhdGlvbi9HZW9sb2NhdGlvbi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpHZW9sb2NhdGlvbjo6R2VvTm90aWZpZXI6OnRpbWVyRmlyZWQpOgorICAgICAgICAoV2Vi Q29yZTo6R2VvbG9jYXRpb246OnN0YXJ0UmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpHZW9s b2NhdGlvbjo6cmVxdWVzdFVzZXNDYWNoZWRQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpH ZW9sb2NhdGlvbjo6bWFrZUNhY2hlZFBvc2l0aW9uQ2FsbGJhY2tzKToKKyAgICAgICAgKFdlYkNv cmU6Okdlb2xvY2F0aW9uOjpzZXRJc0FsbG93ZWQpOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9j YXRpb246OmNhbmNlbFJlcXVlc3RzKToKKyAgICAgICAgKFdlYkNvcmU6Okdlb2xvY2F0aW9uOjpo YW5kbGVQZW5kaW5nUGVybWlzc2lvbk5vdGlmaWVycyk6CisgICAgICAgICogTW9kdWxlcy9nZW9s b2NhdGlvbi9HZW9sb2NhdGlvbkNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R2Vv bG9jYXRpb25Db250cm9sbGVyOjpwb3NpdGlvbkNoYW5nZWQpOgorICAgICAgICAqIE1vZHVsZXMv bm90aWZpY2F0aW9ucy9Xb3JrZXJDb250ZXh0Tm90aWZpY2F0aW9ucy5jcHA6CisgICAgICAgIFVz ZSBBU0NJSUxpdGVyYWwgZm9yIGNvbnN0YW50IHN0cmluZ3MgYmVjb21pbmcgV1RGU3RyaW5ncy4K KworICAgICAgICAoV2ViQ29yZTo6V29ya2VyQ29udGV4dE5vdGlmaWNhdGlvbnM6OmZyb20pOgor ICAgICAgICBVc2UgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCBmb3IgdGhlIHN0 YXRpYyBsb2NhbC4KKwogMjAxMi0xMi0xOCAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjU3 OQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9nZW9sb2NhdGlvbi9HZW9sb2Nh dGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2dlb2xvY2F0aW9uL0dlb2xvY2F0aW9u LmNwcAppbmRleCA5OGIxMGQwLi5kNGI3MzllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2dlb2xvY2F0aW9uL0dlb2xvY2F0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2dlb2xvY2F0aW9uL0dlb2xvY2F0aW9uLmNwcApAQCAtMzAsOCArMzAsNiBAQAogCiAj aWYgRU5BQkxFKEdFT0xPQ0FUSU9OKQogCi0jaW5jbHVkZSAiQ2hyb21lLmgiCi0jaW5jbHVkZSAi Q2hyb21lQ2xpZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJGcmFtZS5o IgogI2luY2x1ZGUgIkdlb3Bvc2l0aW9uLmgiCkBAIC0xNjksNyArMTY3LDcgQEAgdm9pZCBHZW9s b2NhdGlvbjo6R2VvTm90aWZpZXI6OnRpbWVyRmlyZWQoVGltZXI8R2VvTm90aWZpZXI+KikKICAg ICB9CiAKICAgICBpZiAobV9lcnJvckNhbGxiYWNrKSB7Ci0gICAgICAgIFJlZlB0cjxQb3NpdGlv bkVycm9yPiBlcnJvciA9IFBvc2l0aW9uRXJyb3I6OmNyZWF0ZShQb3NpdGlvbkVycm9yOjpUSU1F T1VULCAiVGltZW91dCBleHBpcmVkIik7CisgICAgICAgIFJlZlB0cjxQb3NpdGlvbkVycm9yPiBl cnJvciA9IFBvc2l0aW9uRXJyb3I6OmNyZWF0ZShQb3NpdGlvbkVycm9yOjpUSU1FT1VULCBBU0NJ SUxpdGVyYWwoIlRpbWVvdXQgZXhwaXJlZCIpKTsKICAgICAgICAgbV9lcnJvckNhbGxiYWNrLT5o YW5kbGVFdmVudChlcnJvci5nZXQoKSk7CiAgICAgfQogICAgIG1fZ2VvbG9jYXRpb24tPnJlcXVl c3RUaW1lZE91dCh0aGlzKTsKQEAgLTMxOSw3ICszMTcsNyBAQCB2b2lkIEdlb2xvY2F0aW9uOjpz dGFydFJlcXVlc3QoR2VvTm90aWZpZXIgKm5vdGlmaWVyKQogICAgIC8vIENoZWNrIHdoZXRoZXIg cGVybWlzc2lvbnMgaGF2ZSBhbHJlYWR5IGJlZW4gZGVuaWVkLiBOb3RlIHRoYXQgaWYgdGhpcyBp cyB0aGUgY2FzZSwKICAgICAvLyB0aGUgcGVybWlzc2lvbiBzdGF0ZSBjYW4gbm90IGNoYW5nZSBh Z2FpbiBpbiB0aGUgbGlmZXRpbWUgb2YgdGhpcyBwYWdlLgogICAgIGlmIChpc0RlbmllZCgpKQot ICAgICAgICBub3RpZmllci0+c2V0RmF0YWxFcnJvcihQb3NpdGlvbkVycm9yOjpjcmVhdGUoUG9z aXRpb25FcnJvcjo6UEVSTUlTU0lPTl9ERU5JRUQsIHBlcm1pc3Npb25EZW5pZWRFcnJvck1lc3Nh Z2UpKTsKKyAgICAgICAgbm90aWZpZXItPnNldEZhdGFsRXJyb3IoUG9zaXRpb25FcnJvcjo6Y3Jl YXRlKFBvc2l0aW9uRXJyb3I6OlBFUk1JU1NJT05fREVOSUVELCBBU0NJSUxpdGVyYWwocGVybWlz c2lvbkRlbmllZEVycm9yTWVzc2FnZSkpKTsKICAgICBlbHNlIGlmIChoYXZlU3VpdGFibGVDYWNo ZWRQb3NpdGlvbihub3RpZmllci0+b3B0aW9ucygpKSkKICAgICAgICAgbm90aWZpZXItPnNldFVz ZUNhY2hlZFBvc2l0aW9uKCk7CiAgICAgZWxzZSBpZiAobm90aWZpZXItPmhhc1plcm9UaW1lb3V0 KCkpCkBAIC0zMzEsNyArMzI5LDcgQEAgdm9pZCBHZW9sb2NhdGlvbjo6c3RhcnRSZXF1ZXN0KEdl b05vdGlmaWVyICpub3RpZmllcikKICAgICB9IGVsc2UgaWYgKHN0YXJ0VXBkYXRpbmcobm90aWZp ZXIpKQogICAgICAgICBub3RpZmllci0+c3RhcnRUaW1lcklmTmVlZGVkKCk7CiAgICAgZWxzZQot ICAgICAgICBub3RpZmllci0+c2V0RmF0YWxFcnJvcihQb3NpdGlvbkVycm9yOjpjcmVhdGUoUG9z aXRpb25FcnJvcjo6UE9TSVRJT05fVU5BVkFJTEFCTEUsIGZhaWxlZFRvU3RhcnRTZXJ2aWNlRXJy b3JNZXNzYWdlKSk7CisgICAgICAgIG5vdGlmaWVyLT5zZXRGYXRhbEVycm9yKFBvc2l0aW9uRXJy b3I6OmNyZWF0ZShQb3NpdGlvbkVycm9yOjpQT1NJVElPTl9VTkFWQUlMQUJMRSwgQVNDSUlMaXRl cmFsKGZhaWxlZFRvU3RhcnRTZXJ2aWNlRXJyb3JNZXNzYWdlKSkpOwogfQogCiB2b2lkIEdlb2xv Y2F0aW9uOjpmYXRhbEVycm9yT2NjdXJyZWQoR2VvbG9jYXRpb246Okdlb05vdGlmaWVyKiBub3Rp ZmllcikKQEAgLTM0OSw3ICszNDcsNyBAQCB2b2lkIEdlb2xvY2F0aW9uOjpyZXF1ZXN0VXNlc0Nh Y2hlZFBvc2l0aW9uKEdlb05vdGlmaWVyKiBub3RpZmllcikKICAgICAvLyBUaGlzIGlzIGNhbGxl ZCBhc3luY2hyb25vdXNseSwgc28gdGhlIHBlcm1pc3Npb25zIGNvdWxkIGhhdmUgYmVlbiBkZW5p ZWQKICAgICAvLyBzaW5jZSB3ZSBsYXN0IGNoZWNrZWQgaW4gc3RhcnRSZXF1ZXN0LgogICAgIGlm IChpc0RlbmllZCgpKSB7Ci0gICAgICAgIG5vdGlmaWVyLT5zZXRGYXRhbEVycm9yKFBvc2l0aW9u RXJyb3I6OmNyZWF0ZShQb3NpdGlvbkVycm9yOjpQRVJNSVNTSU9OX0RFTklFRCwgcGVybWlzc2lv bkRlbmllZEVycm9yTWVzc2FnZSkpOworICAgICAgICBub3RpZmllci0+c2V0RmF0YWxFcnJvcihQ b3NpdGlvbkVycm9yOjpjcmVhdGUoUG9zaXRpb25FcnJvcjo6UEVSTUlTU0lPTl9ERU5JRUQsIEFT Q0lJTGl0ZXJhbChwZXJtaXNzaW9uRGVuaWVkRXJyb3JNZXNzYWdlKSkpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCkBAIC0zODMsNyArMzgxLDcgQEAgdm9pZCBHZW9sb2NhdGlvbjo6bWFrZUNh Y2hlZFBvc2l0aW9uQ2FsbGJhY2tzKCkKICAgICAgICAgICAgIGlmIChub3RpZmllci0+aGFzWmVy b1RpbWVvdXQoKSB8fCBzdGFydFVwZGF0aW5nKG5vdGlmaWVyKSkKICAgICAgICAgICAgICAgICBu b3RpZmllci0+c3RhcnRUaW1lcklmTmVlZGVkKCk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgbm90aWZpZXItPnNldEZhdGFsRXJyb3IoUG9zaXRpb25FcnJvcjo6Y3JlYXRlKFBv c2l0aW9uRXJyb3I6OlBPU0lUSU9OX1VOQVZBSUxBQkxFLCBmYWlsZWRUb1N0YXJ0U2VydmljZUVy cm9yTWVzc2FnZSkpOworICAgICAgICAgICAgICAgIG5vdGlmaWVyLT5zZXRGYXRhbEVycm9yKFBv c2l0aW9uRXJyb3I6OmNyZWF0ZShQb3NpdGlvbkVycm9yOjpQT1NJVElPTl9VTkFWQUlMQUJMRSwg QVNDSUlMaXRlcmFsKGZhaWxlZFRvU3RhcnRTZXJ2aWNlRXJyb3JNZXNzYWdlKSkpOwogICAgICAg ICB9CiAgICAgfQogCkBAIC00NDUsNyArNDQzLDcgQEAgdm9pZCBHZW9sb2NhdGlvbjo6c2V0SXNB bGxvd2VkKGJvb2wgYWxsb3dlZCkKICAgICB9CiAKICAgICBpZiAoIWlzQWxsb3dlZCgpKSB7Ci0g ICAgICAgIFJlZlB0cjxQb3NpdGlvbkVycm9yPiBlcnJvciA9IFBvc2l0aW9uRXJyb3I6OmNyZWF0 ZShQb3NpdGlvbkVycm9yOjpQRVJNSVNTSU9OX0RFTklFRCwgcGVybWlzc2lvbkRlbmllZEVycm9y TWVzc2FnZSk7CisgICAgICAgIFJlZlB0cjxQb3NpdGlvbkVycm9yPiBlcnJvciA9IFBvc2l0aW9u RXJyb3I6OmNyZWF0ZShQb3NpdGlvbkVycm9yOjpQRVJNSVNTSU9OX0RFTklFRCwgIEFTQ0lJTGl0 ZXJhbChwZXJtaXNzaW9uRGVuaWVkRXJyb3JNZXNzYWdlKSk7CiAgICAgICAgIGVycm9yLT5zZXRJ c0ZhdGFsKHRydWUpOwogICAgICAgICBoYW5kbGVFcnJvcihlcnJvci5nZXQoKSk7CiAgICAgICAg IG1fcmVxdWVzdHNBd2FpdGluZ0NhY2hlZFBvc2l0aW9uLmNsZWFyKCk7CkBAIC01MTEsNyArNTA5 LDcgQEAgdm9pZCBHZW9sb2NhdGlvbjo6Y2FuY2VsUmVxdWVzdHMoR2VvTm90aWZpZXJWZWN0b3Im IG5vdGlmaWVycykKIHsKICAgICBHZW9Ob3RpZmllclZlY3Rvcjo6Y29uc3RfaXRlcmF0b3IgZW5k ID0gbm90aWZpZXJzLmVuZCgpOwogICAgIGZvciAoR2VvTm90aWZpZXJWZWN0b3I6OmNvbnN0X2l0 ZXJhdG9yIGl0ID0gbm90aWZpZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkKLSAgICAgICAg KCppdCktPnNldEZhdGFsRXJyb3IoUG9zaXRpb25FcnJvcjo6Y3JlYXRlKFBvc2l0aW9uRXJyb3I6 OlBPU0lUSU9OX1VOQVZBSUxBQkxFLCBmcmFtZWxlc3NEb2N1bWVudEVycm9yTWVzc2FnZSkpOwor ICAgICAgICAoKml0KS0+c2V0RmF0YWxFcnJvcihQb3NpdGlvbkVycm9yOjpjcmVhdGUoUG9zaXRp b25FcnJvcjo6UE9TSVRJT05fVU5BVkFJTEFCTEUsIEFTQ0lJTGl0ZXJhbChmcmFtZWxlc3NEb2N1 bWVudEVycm9yTWVzc2FnZSkpKTsKIH0KIAogdm9pZCBHZW9sb2NhdGlvbjo6Y2FuY2VsQWxsUmVx dWVzdHMoKQpAQCAtNjcwLDkgKzY2OCw5IEBAIHZvaWQgR2VvbG9jYXRpb246OmhhbmRsZVBlbmRp bmdQZXJtaXNzaW9uTm90aWZpZXJzKCkKICAgICAgICAgICAgIGlmIChzdGFydFVwZGF0aW5nKG5v dGlmaWVyKSkKICAgICAgICAgICAgICAgICBub3RpZmllci0+c3RhcnRUaW1lcklmTmVlZGVkKCk7 CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgbm90aWZpZXItPnNldEZhdGFsRXJy b3IoUG9zaXRpb25FcnJvcjo6Y3JlYXRlKFBvc2l0aW9uRXJyb3I6OlBPU0lUSU9OX1VOQVZBSUxB QkxFLCBmYWlsZWRUb1N0YXJ0U2VydmljZUVycm9yTWVzc2FnZSkpOworICAgICAgICAgICAgICAg IG5vdGlmaWVyLT5zZXRGYXRhbEVycm9yKFBvc2l0aW9uRXJyb3I6OmNyZWF0ZShQb3NpdGlvbkVy cm9yOjpQT1NJVElPTl9VTkFWQUlMQUJMRSwgQVNDSUlMaXRlcmFsKGZhaWxlZFRvU3RhcnRTZXJ2 aWNlRXJyb3JNZXNzYWdlKSkpOwogICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIG5vdGlmaWVy LT5zZXRGYXRhbEVycm9yKFBvc2l0aW9uRXJyb3I6OmNyZWF0ZShQb3NpdGlvbkVycm9yOjpQRVJN SVNTSU9OX0RFTklFRCwgcGVybWlzc2lvbkRlbmllZEVycm9yTWVzc2FnZSkpOworICAgICAgICAg ICAgbm90aWZpZXItPnNldEZhdGFsRXJyb3IoUG9zaXRpb25FcnJvcjo6Y3JlYXRlKFBvc2l0aW9u RXJyb3I6OlBFUk1JU1NJT05fREVOSUVELCBBU0NJSUxpdGVyYWwocGVybWlzc2lvbkRlbmllZEVy cm9yTWVzc2FnZSkpKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9jYXRpb25Db250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvZ2VvbG9jYXRpb24vR2VvbG9jYXRpb25Db250cm9sbGVyLmNwcAppbmRleCAz ZTUwYWU5Li40ZTZmNThlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2dlb2xv Y2F0aW9uL0dlb2xvY2F0aW9uQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9nZW9sb2NhdGlvbi9HZW9sb2NhdGlvbkNvbnRyb2xsZXIuY3BwCkBAIC0xMDMsNyArMTAz LDcgQEAgdm9pZCBHZW9sb2NhdGlvbkNvbnRyb2xsZXI6OnBvc2l0aW9uQ2hhbmdlZChHZW9sb2Nh dGlvblBvc2l0aW9uKiBwb3NpdGlvbikKIHsKICAgICBwb3NpdGlvbiA9IEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6b3ZlcnJpZGVHZW9sb2NhdGlvblBvc2l0aW9uKG1fcGFnZSwgcG9zaXRpb24p OwogICAgIGlmICghcG9zaXRpb24pIHsKLSAgICAgICAgZXJyb3JPY2N1cnJlZChHZW9sb2NhdGlv bkVycm9yOjpjcmVhdGUoR2VvbG9jYXRpb25FcnJvcjo6UG9zaXRpb25VbmF2YWlsYWJsZSwgIlBv c2l0aW9uVW5hdmFpbGFibGUiKS5nZXQoKSk7CisgICAgICAgIGVycm9yT2NjdXJyZWQoR2VvbG9j YXRpb25FcnJvcjo6Y3JlYXRlKEdlb2xvY2F0aW9uRXJyb3I6OlBvc2l0aW9uVW5hdmFpbGFibGUs IEFTQ0lJTGl0ZXJhbCgiUG9zaXRpb25VbmF2YWlsYWJsZSIpKS5nZXQoKSk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAgICAgbV9sYXN0UG9zaXRpb24gPSBwb3NpdGlvbjsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Xb3JrZXJDb250ZXh0Tm90aWZp Y2F0aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL25vdGlmaWNhdGlvbnMvV29ya2Vy Q29udGV4dE5vdGlmaWNhdGlvbnMuY3BwCmluZGV4IGVlZWRiOTkuLjIxOGZlMWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbm90aWZpY2F0aW9ucy9Xb3JrZXJDb250ZXh0Tm90 aWZpY2F0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9ub3RpZmljYXRpb25z L1dvcmtlckNvbnRleHROb3RpZmljYXRpb25zLmNwcApAQCAtNDcsNyArNDcsNyBAQCBXb3JrZXJD b250ZXh0Tm90aWZpY2F0aW9uczo6fldvcmtlckNvbnRleHROb3RpZmljYXRpb25zKCkKIAogV29y a2VyQ29udGV4dE5vdGlmaWNhdGlvbnMqIFdvcmtlckNvbnRleHROb3RpZmljYXRpb25zOjpmcm9t KFdvcmtlckNvbnRleHQqIGNvbnRleHQpCiB7Ci0gICAgQXRvbWljU3RyaW5nIHN1cHBsZW1lbnRO YW1lID0gIldvcmtlckNvbnRleHROb3RpZmljYXRpb25zIjsKKyAgICBERUZJTkVfU1RBVElDX0xP Q0FMKEF0b21pY1N0cmluZywgc3VwcGxlbWVudE5hbWUsICgiV29ya2VyQ29udGV4dE5vdGlmaWNh dGlvbnMiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7CiAgICAgV29ya2Vy Q29udGV4dE5vdGlmaWNhdGlvbnMqIHN1cHBsZW1lbnQgPSBzdGF0aWNfY2FzdDxXb3JrZXJDb250 ZXh0Tm90aWZpY2F0aW9ucyo+KFN1cHBsZW1lbnQ8U2NyaXB0RXhlY3V0aW9uQ29udGV4dD46OmZy b20oY29udGV4dCwgc3VwcGxlbWVudE5hbWUpKTsKICAgICBpZiAoIXN1cHBsZW1lbnQpIHsKICAg ICAgICAgc3VwcGxlbWVudCA9IG5ldyBXb3JrZXJDb250ZXh0Tm90aWZpY2F0aW9ucyhjb250ZXh0 KTsK