128096 2014-02-02 21:51:05 -0800 IDB: Cannot open new databases with the default version 2014-02-02 22:15:52 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 124521 1 beidson beidson alecflett commit-queue jsbell webkit-bug-importer oldest_to_newest 974920 0 beidson 2014-02-02 21:51:05 -0800 IDB: Cannot open new databases with the default version 974921 1 222959 beidson 2014-02-02 21:53:24 -0800 Created attachment 222959 Patch v1 974922 2 commit-queue 2014-02-02 21:54:37 -0800 Attachment 222959 did not pass style-queue: ERROR: Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp:475: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 974923 3 webkit-bug-importer 2014-02-02 22:07:22 -0800 <rdar://problem/15966919> 974924 4 222960 beidson 2014-02-02 22:08:01 -0800 Created attachment 222960 Patch v2 - Fix style by making code read the true intention 974927 5 222959 jonlee 2014-02-02 22:13:53 -0800 Comment on attachment 222959 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=222959&action=review provisional r=me with the changes above. > Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp:475 > + if (isNewDatabase && version == 0) { DefaultIntVersion? > Source/WebKit2/ChangeLog:10 > + have the magic “no version set” version. Pretty quotes are not so pretty here. 974929 6 beidson 2014-02-02 22:15:22 -0800 (In reply to comment #5) > (From update of attachment 222959 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=222959&action=review > > provisional r=me with the changes above. > > > Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp:475 > > + if (isNewDatabase && version == 0) { > > DefaultIntVersion? Yep, that's the intent. Fixed. > > > Source/WebKit2/ChangeLog:10 > > + have the magic “no version set” version. > > Pretty quotes are not so pretty here. Fixed locally. Thanks! 974930 7 beidson 2014-02-02 22:15:52 -0800 http://trac.webkit.org/changeset/163287 222959 2014-02-02 21:53:24 -0800 2014-02-02 22:13:53 -0800 Patch v1 patch text/plain 6433 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZDMyZWUzLi4zMmMxZTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkg QEAKIDIwMTQtMDItMDIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIElEQjogQ2Fubm90IG9wZW4gbmV3IGRhdGFiYXNlcyB3aXRoIHRoZSBkZWZhdWx0IHZlcnNp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODA5 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9k dWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2VCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQkRhdGFiYXNlQmFja2VuZDo6b3BlbkNvbm5lY3Rpb25JbnRlcm5hbCk6IFVwZGF0ZSBsb2dp YyB0byBoYW5kbGUgdGhlCisgICAgICAgICAgY3VycmVudCB2ZXJzaW9uIGJlaW5nIE5vSW50VmVy c2lvbi4KKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5zYWN0aW9uQmFja2Vu ZE9wZXJhdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCRGF0YWJhc2VCYWNrZW5kOjpW ZXJzaW9uQ2hhbmdlT3BlcmF0aW9uOjpwZXJmb3JtKTogVXBkYXRlIEFTU0VSVC4KKworMjAxNC0w Mi0wMiAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgSURCOiBT dXBwb3J0IElEQkZhY3RvcnkuZGVsZXRlRGF0YWJhc2UoKQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MDYwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNlQmFja2VuZC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJEYXRhYmFzZUJhY2tlbmQuY3BwCmluZGV4IDk5 OWExNjcuLjdmMmUwYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkRhdGFiYXNlQmFja2VuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCRGF0YWJhc2VCYWNrZW5kLmNwcApAQCAtNDYzLDMxICs0NjMsMjYgQEAgdm9p ZCBJREJEYXRhYmFzZUJhY2tlbmQ6Om9wZW5Db25uZWN0aW9uSW50ZXJuYWwoUGFzc1JlZlB0cjxJ REJDYWxsYmFja3M+IHBycENhbGwKICAgICBSZWZQdHI8SURCQ2FsbGJhY2tzPiBjYWxsYmFja3Mg PSBwcnBDYWxsYmFja3M7CiAgICAgUmVmUHRyPElEQkRhdGFiYXNlQ2FsbGJhY2tzPiBkYXRhYmFz ZUNhbGxiYWNrcyA9IHBycERhdGFiYXNlQ2FsbGJhY2tzOwogCi0gICAgLy8gV2UgaW5mZXIgdGhh dCB0aGUgZGF0YWJhc2UgZGlkbid0IGV4aXN0IGZyb20gaXRzIGxhY2sgb2YgZWl0aGVyIHR5cGUg b2YgdmVyc2lvbi4KKyAgICAvLyBXZSBpbmZlciB0aGF0IHRoZSBkYXRhYmFzZSBkaWRuJ3QgZXhp c3QgZnJvbSBpdHMgbGFjayBvZiB2ZXJzaW9uLgogICAgIGJvb2wgaXNOZXdEYXRhYmFzZSA9IG1f bWV0YWRhdGEudmVyc2lvbiA9PSBJREJEYXRhYmFzZU1ldGFkYXRhOjpOb0ludFZlcnNpb247CiAK LSAgICBpZiAodmVyc2lvbiA9PSBJREJEYXRhYmFzZU1ldGFkYXRhOjpEZWZhdWx0SW50VmVyc2lv bikgeworICAgIGlmICh2ZXJzaW9uID09IElEQkRhdGFiYXNlTWV0YWRhdGE6OkRlZmF1bHRJbnRW ZXJzaW9uICYmICFpc05ld0RhdGFiYXNlKSB7CiAgICAgICAgIG1fZGF0YWJhc2VDYWxsYmFja3NT ZXQuYWRkKGRhdGFiYXNlQ2FsbGJhY2tzKTsKICAgICAgICAgY2FsbGJhY2tzLT5vblN1Y2Nlc3Mo dGhpcywgdGhpcy0+bWV0YWRhdGEoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBp ZiAodmVyc2lvbiA9PSBJREJEYXRhYmFzZU1ldGFkYXRhOjpOb0ludFZlcnNpb24pIHsKLSAgICAg ICAgaWYgKCFpc05ld0RhdGFiYXNlKSB7Ci0gICAgICAgICAgICBtX2RhdGFiYXNlQ2FsbGJhY2tz U2V0LmFkZChSZWZQdHI8SURCRGF0YWJhc2VDYWxsYmFja3M+KGRhdGFiYXNlQ2FsbGJhY2tzKSk7 Ci0gICAgICAgICAgICBjYWxsYmFja3MtPm9uU3VjY2Vzcyh0aGlzLCB0aGlzLT5tZXRhZGF0YSgp KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAgIGlmIChpc05ld0RhdGFiYXNl ICYmIHZlcnNpb24gPT0gMCkgewogICAgICAgICAvLyBTcGVjIHNheXM6IElmIG5vIHZlcnNpb24g aXMgc3BlY2lmaWVkIGFuZCBubyBkYXRhYmFzZSBleGlzdHMsIHNldCBkYXRhYmFzZSB2ZXJzaW9u IHRvIDEuCiAgICAgICAgIHZlcnNpb24gPSAxOwogICAgIH0KIAotICAgIGlmICh2ZXJzaW9uID4g bV9tZXRhZGF0YS52ZXJzaW9uKSB7CisgICAgaWYgKHZlcnNpb24gPiBtX21ldGFkYXRhLnZlcnNp b24gfHwgbV9tZXRhZGF0YS52ZXJzaW9uID09IElEQkRhdGFiYXNlTWV0YWRhdGE6Ok5vSW50VmVy c2lvbikgewogICAgICAgICBydW5JbnRWZXJzaW9uQ2hhbmdlVHJhbnNhY3Rpb24oY2FsbGJhY2tz LCBkYXRhYmFzZUNhbGxiYWNrcywgdHJhbnNhY3Rpb25JZCwgdmVyc2lvbik7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKLSAgICBpZiAodmVyc2lvbiA8IG1fbWV0YWRhdGEudmVyc2lvbikgewor ICAgIGlmICh2ZXJzaW9uIDwgbV9tZXRhZGF0YS52ZXJzaW9uICYmIG1fbWV0YWRhdGEudmVyc2lv biAhPSBJREJEYXRhYmFzZU1ldGFkYXRhOjpOb0ludFZlcnNpb24pIHsKICAgICAgICAgY2FsbGJh Y2tzLT5vbkVycm9yKElEQkRhdGFiYXNlRXJyb3I6OmNyZWF0ZShJREJEYXRhYmFzZUV4Y2VwdGlv bjo6VmVyc2lvbkVycm9yLCBTdHJpbmc6OmZvcm1hdCgiVGhlIHJlcXVlc3RlZCB2ZXJzaW9uICgl bGx1KSBpcyBsZXNzIHRoYW4gdGhlIGV4aXN0aW5nIHZlcnNpb24gKCVsbHUpLiIsIHN0YXRpY19j YXN0PHVuc2lnbmVkIGxvbmcgbG9uZz4odmVyc2lvbiksIHN0YXRpY19jYXN0PHVuc2lnbmVkIGxv bmcgbG9uZz4obV9tZXRhZGF0YS52ZXJzaW9uKSkpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5zYWN0 aW9uQmFja2VuZE9wZXJhdGlvbnMuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVk ZGIvSURCVHJhbnNhY3Rpb25CYWNrZW5kT3BlcmF0aW9ucy5jcHAKaW5kZXggNGE3NTdlZi4uOGQ5 MjA5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvSURCVHJh bnNhY3Rpb25CYWNrZW5kT3BlcmF0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvSURCVHJhbnNhY3Rpb25CYWNrZW5kT3BlcmF0aW9ucy5jcHAKQEAgLTI0Myw3 ICsyNDMsNyBAQCB2b2lkIElEQkRhdGFiYXNlQmFja2VuZDo6VmVyc2lvbkNoYW5nZU9wZXJhdGlv bjo6cGVyZm9ybShzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gYwogCiAgICAgdWludDY0X3Qgb2xkVmVy c2lvbiA9IG1fdHJhbnNhY3Rpb24tPmRhdGFiYXNlKCkubWV0YWRhdGEoKS52ZXJzaW9uOwogICAg IFJlZlB0cjxJREJEYXRhYmFzZUJhY2tlbmQ6OlZlcnNpb25DaGFuZ2VPcGVyYXRpb24+IG9wZXJh dGlvbih0aGlzKTsKLSAgICBBU1NFUlQoc3RhdGljX2Nhc3Q8dWludDY0X3Q+KG1fdmVyc2lvbikg PiBvbGRWZXJzaW9uKTsKKyAgICBBU1NFUlQoc3RhdGljX2Nhc3Q8dWludDY0X3Q+KG1fdmVyc2lv bikgPiBvbGRWZXJzaW9uIHx8IG9sZFZlcnNpb24gPT0gSURCRGF0YWJhc2VNZXRhZGF0YTo6Tm9J bnRWZXJzaW9uKTsKIAogICAgIHN0ZDo6ZnVuY3Rpb248dm9pZChQYXNzUmVmUHRyPElEQkRhdGFi YXNlRXJyb3I+KT4gb3BlcmF0aW9uQ2FsbGJhY2sgPSBbb2xkVmVyc2lvbiwgb3BlcmF0aW9uLCB0 aGlzLCBjb21wbGV0aW9uQ2FsbGJhY2tdKFBhc3NSZWZQdHI8SURCRGF0YWJhc2VFcnJvcj4gcHJw RXJyb3IpIHsKICAgICAgICAgUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+IGVycm9yID0gcHJwRXJy b3I7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKaW5kZXggZmJlNDQ3Ny4uNGVmN2M4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsx LDE2IEBACiAyMDE0LTAyLTAyICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAor ICAgICAgICBJREI6IENhbm5vdCBvcGVuIG5ldyBkYXRhYmFzZXMgd2l0aCB0aGUgZGVmYXVsdCB2 ZXJzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MjgwOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IERhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2lu Z1N0b3JlU1FMaXRlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VW5pcXVlSURCRGF0YWJhc2VCYWNr aW5nU3RvcmVTUUxpdGU6OmNyZWF0ZUFuZFBvcHVsYXRlSW5pdGlhbE1ldGFkYXRhKTogTmV3IGRh dGFiYXNlcyBzaG91bGQKKyAgICAgICAgICBoYXZlIHRoZSBtYWdpYyDigJxubyB2ZXJzaW9uIHNl dOKAnSB2ZXJzaW9uLgorCisyMDE0LTAyLTAyICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxl LmNvbT4KKwogICAgICAgICBJREI6IFN1cHBvcnQgSURCRmFjdG9yeS5kZWxldGVEYXRhYmFzZSgp CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgwNjAK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9z cWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwIGIvU291cmNlL1dl YktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VC YWNraW5nU3RvcmVTUUxpdGUuY3BwCmluZGV4IDdiYmZkYTEuLmZjMDM5MzIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1ZUlE QkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRh YmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9y ZVNRTGl0ZS5jcHAKQEAgLTE0MCw3ICsxNDAsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8SURCRGF0YWJh c2VNZXRhZGF0YT4gVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6OmNyZWF0ZQog ICAgICAgICAvLyBUaGVyZWZvcmUgd2UnbGwgc3RvcmUgdGhlIHZlcnNpb24gYXMgYSBTdHJpbmcu CiAgICAgICAgIFNRTGl0ZVN0YXRlbWVudCBzcWwoKm1fc3FsaXRlREIsIEFTQ0lJTGl0ZXJhbCgi SU5TRVJUIElOVE8gSURCRGF0YWJhc2VJbmZvIFZBTFVFUyAoJ0RhdGFiYXNlVmVyc2lvbicsID8p OyIpKTsKICAgICAgICAgaWYgKHNxbC5wcmVwYXJlKCkgIT0gU1FMUmVzdWx0T2sKLSAgICAgICAg ICAgIHx8IHNxbC5iaW5kVGV4dCgxLCBTdHJpbmc6Om51bWJlcigwKSkgIT0gU1FMUmVzdWx0T2sK KyAgICAgICAgICAgIHx8IHNxbC5iaW5kVGV4dCgxLCBTdHJpbmc6Om51bWJlcihJREJEYXRhYmFz ZU1ldGFkYXRhOjpOb0ludFZlcnNpb24pKSAhPSBTUUxSZXN1bHRPawogICAgICAgICAgICAgfHwg c3FsLnN0ZXAoKSAhPSBTUUxSZXN1bHREb25lKSB7CiAgICAgICAgICAgICBMT0dfRVJST1IoIkNv dWxkIG5vdCBpbnNlcnQgZGVmYXVsdCB2ZXJzaW9uIGludG8gSURCRGF0YWJhc2VJbmZvIHRhYmxl ICglaSkgLSAlcyIsIG1fc3FsaXRlREItPmxhc3RFcnJvcigpLCBtX3NxbGl0ZURCLT5sYXN0RXJy b3JNc2coKSk7CiAgICAgICAgICAgICBtX3NxbGl0ZURCID0gbnVsbHB0cjsKQEAgLTE1Nyw3ICsx NTcsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8SURCRGF0YWJhc2VNZXRhZGF0YT4gVW5pcXVlSURCRGF0 YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6OmNyZWF0ZQogICAgIC8vIFRoaXMgaW5pdGlhbCBtZXRh ZGF0YSBtYXRjaGVzIHRoZSBkZWZhdWx0IHZhbHVlcyB3ZSBqdXN0IHB1dCBpbnRvIHRoZSBtZXRh ZGF0YSBkYXRhYmFzZS4KICAgICBhdXRvIG1ldGFkYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxJREJE YXRhYmFzZU1ldGFkYXRhPigpOwogICAgIG1ldGFkYXRhLT5uYW1lID0gbV9pZGVudGlmaWVyLmRh dGFiYXNlTmFtZSgpOwotICAgIG1ldGFkYXRhLT52ZXJzaW9uID0gMDsKKyAgICBtZXRhZGF0YS0+ dmVyc2lvbiA9IElEQkRhdGFiYXNlTWV0YWRhdGE6Ok5vSW50VmVyc2lvbjsKICAgICBtZXRhZGF0 YS0+bWF4T2JqZWN0U3RvcmVJZCA9IDE7CiAKICAgICByZXR1cm4gbWV0YWRhdGE7Cg== 222960 2014-02-02 22:08:01 -0800 2014-02-02 22:12:30 -0800 Patch v2 - Fix style by making code read the true intention patch text/plain 6466 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZDMyZWUzLi4zMmMxZTE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkg QEAKIDIwMTQtMDItMDIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIElEQjogQ2Fubm90IG9wZW4gbmV3IGRhdGFiYXNlcyB3aXRoIHRoZSBkZWZhdWx0IHZlcnNp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODA5 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9k dWxlcy9pbmRleGVkZGIvSURCRGF0YWJhc2VCYWNrZW5kLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OklEQkRhdGFiYXNlQmFja2VuZDo6b3BlbkNvbm5lY3Rpb25JbnRlcm5hbCk6IFVwZGF0ZSBsb2dp YyB0byBoYW5kbGUgdGhlCisgICAgICAgICAgY3VycmVudCB2ZXJzaW9uIGJlaW5nIE5vSW50VmVy c2lvbi4KKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5zYWN0aW9uQmFja2Vu ZE9wZXJhdGlvbnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURCRGF0YWJhc2VCYWNrZW5kOjpW ZXJzaW9uQ2hhbmdlT3BlcmF0aW9uOjpwZXJmb3JtKTogVXBkYXRlIEFTU0VSVC4KKworMjAxNC0w Mi0wMiAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKICAgICAgICAgSURCOiBT dXBwb3J0IElEQkZhY3RvcnkuZGVsZXRlRGF0YWJhc2UoKQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MDYwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQkRhdGFiYXNlQmFja2VuZC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJEYXRhYmFzZUJhY2tlbmQuY3BwCmluZGV4IDk5 OWExNjcuLjEyODczYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhl ZGRiL0lEQkRhdGFiYXNlQmFja2VuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvSURCRGF0YWJhc2VCYWNrZW5kLmNwcApAQCAtNDYzLDMxICs0NjMsMjYgQEAgdm9p ZCBJREJEYXRhYmFzZUJhY2tlbmQ6Om9wZW5Db25uZWN0aW9uSW50ZXJuYWwoUGFzc1JlZlB0cjxJ REJDYWxsYmFja3M+IHBycENhbGwKICAgICBSZWZQdHI8SURCQ2FsbGJhY2tzPiBjYWxsYmFja3Mg PSBwcnBDYWxsYmFja3M7CiAgICAgUmVmUHRyPElEQkRhdGFiYXNlQ2FsbGJhY2tzPiBkYXRhYmFz ZUNhbGxiYWNrcyA9IHBycERhdGFiYXNlQ2FsbGJhY2tzOwogCi0gICAgLy8gV2UgaW5mZXIgdGhh dCB0aGUgZGF0YWJhc2UgZGlkbid0IGV4aXN0IGZyb20gaXRzIGxhY2sgb2YgZWl0aGVyIHR5cGUg b2YgdmVyc2lvbi4KKyAgICAvLyBXZSBpbmZlciB0aGF0IHRoZSBkYXRhYmFzZSBkaWRuJ3QgZXhp c3QgZnJvbSBpdHMgbGFjayBvZiB2ZXJzaW9uLgogICAgIGJvb2wgaXNOZXdEYXRhYmFzZSA9IG1f bWV0YWRhdGEudmVyc2lvbiA9PSBJREJEYXRhYmFzZU1ldGFkYXRhOjpOb0ludFZlcnNpb247CiAK LSAgICBpZiAodmVyc2lvbiA9PSBJREJEYXRhYmFzZU1ldGFkYXRhOjpEZWZhdWx0SW50VmVyc2lv bikgeworICAgIGlmICh2ZXJzaW9uID09IElEQkRhdGFiYXNlTWV0YWRhdGE6OkRlZmF1bHRJbnRW ZXJzaW9uICYmICFpc05ld0RhdGFiYXNlKSB7CiAgICAgICAgIG1fZGF0YWJhc2VDYWxsYmFja3NT ZXQuYWRkKGRhdGFiYXNlQ2FsbGJhY2tzKTsKICAgICAgICAgY2FsbGJhY2tzLT5vblN1Y2Nlc3Mo dGhpcywgdGhpcy0+bWV0YWRhdGEoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBp ZiAodmVyc2lvbiA9PSBJREJEYXRhYmFzZU1ldGFkYXRhOjpOb0ludFZlcnNpb24pIHsKLSAgICAg ICAgaWYgKCFpc05ld0RhdGFiYXNlKSB7Ci0gICAgICAgICAgICBtX2RhdGFiYXNlQ2FsbGJhY2tz U2V0LmFkZChSZWZQdHI8SURCRGF0YWJhc2VDYWxsYmFja3M+KGRhdGFiYXNlQ2FsbGJhY2tzKSk7 Ci0gICAgICAgICAgICBjYWxsYmFja3MtPm9uU3VjY2Vzcyh0aGlzLCB0aGlzLT5tZXRhZGF0YSgp KTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAgIGlmIChpc05ld0RhdGFiYXNl ICYmIHZlcnNpb24gPT0gSURCRGF0YWJhc2VNZXRhZGF0YTo6RGVmYXVsdEludFZlcnNpb24pIHsK ICAgICAgICAgLy8gU3BlYyBzYXlzOiBJZiBubyB2ZXJzaW9uIGlzIHNwZWNpZmllZCBhbmQgbm8g ZGF0YWJhc2UgZXhpc3RzLCBzZXQgZGF0YWJhc2UgdmVyc2lvbiB0byAxLgogICAgICAgICB2ZXJz aW9uID0gMTsKICAgICB9CiAKLSAgICBpZiAodmVyc2lvbiA+IG1fbWV0YWRhdGEudmVyc2lvbikg eworICAgIGlmICh2ZXJzaW9uID4gbV9tZXRhZGF0YS52ZXJzaW9uIHx8IG1fbWV0YWRhdGEudmVy c2lvbiA9PSBJREJEYXRhYmFzZU1ldGFkYXRhOjpOb0ludFZlcnNpb24pIHsKICAgICAgICAgcnVu SW50VmVyc2lvbkNoYW5nZVRyYW5zYWN0aW9uKGNhbGxiYWNrcywgZGF0YWJhc2VDYWxsYmFja3Ms IHRyYW5zYWN0aW9uSWQsIHZlcnNpb24pOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAg aWYgKHZlcnNpb24gPCBtX21ldGFkYXRhLnZlcnNpb24pIHsKKyAgICBpZiAodmVyc2lvbiA8IG1f bWV0YWRhdGEudmVyc2lvbiAmJiBtX21ldGFkYXRhLnZlcnNpb24gIT0gSURCRGF0YWJhc2VNZXRh ZGF0YTo6Tm9JbnRWZXJzaW9uKSB7CiAgICAgICAgIGNhbGxiYWNrcy0+b25FcnJvcihJREJEYXRh YmFzZUVycm9yOjpjcmVhdGUoSURCRGF0YWJhc2VFeGNlcHRpb246OlZlcnNpb25FcnJvciwgU3Ry aW5nOjpmb3JtYXQoIlRoZSByZXF1ZXN0ZWQgdmVyc2lvbiAoJWxsdSkgaXMgbGVzcyB0aGFuIHRo ZSBleGlzdGluZyB2ZXJzaW9uICglbGx1KS4iLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nIGxv bmc+KHZlcnNpb24pLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBsb25nIGxvbmc+KG1fbWV0YWRhdGEu dmVyc2lvbikpKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9JREJUcmFuc2FjdGlvbkJhY2tlbmRPcGVyYXRpb25z LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5zYWN0aW9uQmFj a2VuZE9wZXJhdGlvbnMuY3BwCmluZGV4IDRhNzU3ZWYuLjhkOTIwOTcgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5zYWN0aW9uQmFja2VuZE9wZXJh dGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL0lEQlRyYW5z YWN0aW9uQmFja2VuZE9wZXJhdGlvbnMuY3BwCkBAIC0yNDMsNyArMjQzLDcgQEAgdm9pZCBJREJE YXRhYmFzZUJhY2tlbmQ6OlZlcnNpb25DaGFuZ2VPcGVyYXRpb246OnBlcmZvcm0oc3RkOjpmdW5j dGlvbjx2b2lkKCk+IGMKIAogICAgIHVpbnQ2NF90IG9sZFZlcnNpb24gPSBtX3RyYW5zYWN0aW9u LT5kYXRhYmFzZSgpLm1ldGFkYXRhKCkudmVyc2lvbjsKICAgICBSZWZQdHI8SURCRGF0YWJhc2VC YWNrZW5kOjpWZXJzaW9uQ2hhbmdlT3BlcmF0aW9uPiBvcGVyYXRpb24odGhpcyk7Ci0gICAgQVNT RVJUKHN0YXRpY19jYXN0PHVpbnQ2NF90PihtX3ZlcnNpb24pID4gb2xkVmVyc2lvbik7CisgICAg QVNTRVJUKHN0YXRpY19jYXN0PHVpbnQ2NF90PihtX3ZlcnNpb24pID4gb2xkVmVyc2lvbiB8fCBv bGRWZXJzaW9uID09IElEQkRhdGFiYXNlTWV0YWRhdGE6Ok5vSW50VmVyc2lvbik7CiAKICAgICBz dGQ6OmZ1bmN0aW9uPHZvaWQoUGFzc1JlZlB0cjxJREJEYXRhYmFzZUVycm9yPik+IG9wZXJhdGlv bkNhbGxiYWNrID0gW29sZFZlcnNpb24sIG9wZXJhdGlvbiwgdGhpcywgY29tcGxldGlvbkNhbGxi YWNrXShQYXNzUmVmUHRyPElEQkRhdGFiYXNlRXJyb3I+IHBycEVycm9yKSB7CiAgICAgICAgIFJl ZlB0cjxJREJEYXRhYmFzZUVycm9yPiBlcnJvciA9IHBycEVycm9yOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGZi ZTQ0NzcuLmI1MDQ1M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNiBAQAogMjAxNC0wMi0wMiAg QnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKKyAgICAgICAgSURCOiBDYW5ub3Qg b3BlbiBuZXcgZGF0YWJhc2VzIHdpdGggdGhlIGRlZmF1bHQgdmVyc2lvbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MDk2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEYXRhYmFzZVByb2Nlc3MvSW5k ZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OlVuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlOjpjcmVh dGVBbmRQb3B1bGF0ZUluaXRpYWxNZXRhZGF0YSk6IE5ldyBkYXRhYmFzZXMgc2hvdWxkCisgICAg ICAgICAgaGF2ZSB0aGUgbWFnaWMgIm5vIHZlcnNpb24gc2V0IiB2ZXJzaW9uLgorCisyMDE0LTAy LTAyICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBJREI6IFN1 cHBvcnQgSURCRmFjdG9yeS5kZWxldGVEYXRhYmFzZSgpCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgwNjAKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VC YWNraW5nU3RvcmVTUUxpdGUuY3BwIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0lu ZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwCmlu ZGV4IDdiYmZkYTEuLmZjMDM5MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNl UHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FM aXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3Nx bGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5jcHAKQEAgLTE0MCw3ICsx NDAsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8SURCRGF0YWJhc2VNZXRhZGF0YT4gVW5pcXVlSURCRGF0 YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6OmNyZWF0ZQogICAgICAgICAvLyBUaGVyZWZvcmUgd2Un bGwgc3RvcmUgdGhlIHZlcnNpb24gYXMgYSBTdHJpbmcuCiAgICAgICAgIFNRTGl0ZVN0YXRlbWVu dCBzcWwoKm1fc3FsaXRlREIsIEFTQ0lJTGl0ZXJhbCgiSU5TRVJUIElOVE8gSURCRGF0YWJhc2VJ bmZvIFZBTFVFUyAoJ0RhdGFiYXNlVmVyc2lvbicsID8pOyIpKTsKICAgICAgICAgaWYgKHNxbC5w cmVwYXJlKCkgIT0gU1FMUmVzdWx0T2sKLSAgICAgICAgICAgIHx8IHNxbC5iaW5kVGV4dCgxLCBT dHJpbmc6Om51bWJlcigwKSkgIT0gU1FMUmVzdWx0T2sKKyAgICAgICAgICAgIHx8IHNxbC5iaW5k VGV4dCgxLCBTdHJpbmc6Om51bWJlcihJREJEYXRhYmFzZU1ldGFkYXRhOjpOb0ludFZlcnNpb24p KSAhPSBTUUxSZXN1bHRPawogICAgICAgICAgICAgfHwgc3FsLnN0ZXAoKSAhPSBTUUxSZXN1bHRE b25lKSB7CiAgICAgICAgICAgICBMT0dfRVJST1IoIkNvdWxkIG5vdCBpbnNlcnQgZGVmYXVsdCB2 ZXJzaW9uIGludG8gSURCRGF0YWJhc2VJbmZvIHRhYmxlICglaSkgLSAlcyIsIG1fc3FsaXRlREIt Pmxhc3RFcnJvcigpLCBtX3NxbGl0ZURCLT5sYXN0RXJyb3JNc2coKSk7CiAgICAgICAgICAgICBt X3NxbGl0ZURCID0gbnVsbHB0cjsKQEAgLTE1Nyw3ICsxNTcsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8 SURCRGF0YWJhc2VNZXRhZGF0YT4gVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6 OmNyZWF0ZQogICAgIC8vIFRoaXMgaW5pdGlhbCBtZXRhZGF0YSBtYXRjaGVzIHRoZSBkZWZhdWx0 IHZhbHVlcyB3ZSBqdXN0IHB1dCBpbnRvIHRoZSBtZXRhZGF0YSBkYXRhYmFzZS4KICAgICBhdXRv IG1ldGFkYXRhID0gc3RkOjptYWtlX3VuaXF1ZTxJREJEYXRhYmFzZU1ldGFkYXRhPigpOwogICAg IG1ldGFkYXRhLT5uYW1lID0gbV9pZGVudGlmaWVyLmRhdGFiYXNlTmFtZSgpOwotICAgIG1ldGFk YXRhLT52ZXJzaW9uID0gMDsKKyAgICBtZXRhZGF0YS0+dmVyc2lvbiA9IElEQkRhdGFiYXNlTWV0 YWRhdGE6Ok5vSW50VmVyc2lvbjsKICAgICBtZXRhZGF0YS0+bWF4T2JqZWN0U3RvcmVJZCA9IDE7 CiAKICAgICByZXR1cm4gbWV0YWRhdGE7Cg==