127585 2014-01-24 14:03:51 -0800 IDB: Support createIndex/deleteIndex 2014-01-24 15:01:37 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 124521 1 beidson beidson andersca ap commit-queue sam thorton oldest_to_newest 971751 0 beidson 2014-01-24 14:03:51 -0800 IDB: Support createIndex/deleteIndex Actual createIndex support in the front-end actually also uses openCursor, so index support is still a wildcard until cursor support is in. In radar as <rdar://problem/15779642> 971752 1 222154 beidson 2014-01-24 14:08:36 -0800 Created attachment 222154 Patch v1 971754 2 commit-queue 2014-01-24 14:10:21 -0800 Attachment 222154 did not pass style-queue: ERROR: Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:457: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:491: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 971771 3 beidson 2014-01-24 15:01:37 -0800 http://trac.webkit.org/changeset/162727 222154 2014-01-24 14:08:36 -0800 2014-01-24 14:54:30 -0800 Patch v1 patch text/plain 15394 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNWExNzU1Li5iODRmZjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUg QEAKIDIwMTQtMDEtMjQgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAg ICAgIElEQjogU3VwcG9ydCBjcmVhdGVJbmRleC9kZWxldGVJbmRleAorICAgICAgICA8cmRhcjov L3Byb2JsZW0vMTU3Nzk2NDI+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI3NTg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBEYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6VW5pcXVlSURCRGF0YWJhc2U6OmNyZWF0ZUluZGV4KToKKyAgICAg ICAgKFdlYktpdDo6VW5pcXVlSURCRGF0YWJhc2U6OmRlbGV0ZUluZGV4KToKKyAgICAgICAgKFdl YktpdDo6VW5pcXVlSURCRGF0YWJhc2U6OmNyZWF0ZUluZGV4SW5CYWNraW5nU3RvcmUpOgorICAg ICAgICAoV2ViS2l0OjpVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlSW5kZXhJbkJhY2tpbmdTdG9y ZSk6CisKKyAgICAgICAgKiBEYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFi YXNlQmFja2luZ1N0b3JlLmg6CisgICAgICAgICogRGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9z cWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwOgorICAgICAgICAo V2ViS2l0OjpVbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZTo6ZGVsZXRlT2JqZWN0 U3RvcmUpOiBBbHNvIGRyb3AgYWxsIGFzc29jaWF0ZWQgaW5kZXhlcy4KKyAgICAgICAgKFdlYktp dDo6VW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6OmNyZWF0ZUluZGV4KToKKyAg ICAgICAgKFdlYktpdDo6VW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGU6OmRlbGV0 ZUluZGV4KToKKyAgICAgICAgKiBEYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9Vbmlx dWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZS5oOgorCisyMDE0LTAxLTI0ICBCcmFkeSBF aWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAgICBJREI6IHN1cHBvcnQgY3JlYXRl SW5kZXgvZGVsZXRlSW5kZXggbWVzc2FnaW5nCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc1NDYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv RGF0YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFzZS5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcApp bmRleCAxZDQyODhlLi5lYWIxM2Y4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9EYXRhYmFz ZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcApAQCAt NDMzLDcgKzQzMyw3IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmNsZWFyT2JqZWN0U3RvcmUo Y29uc3QgSURCVHJhbnNhY3Rpb25JZGVudGlmaWVyJiBpZGVudGlmCiAgICAgcG9zdERhdGFiYXNl VGFzayhjcmVhdGVBc3luY1Rhc2soKnRoaXMsICZVbmlxdWVJREJEYXRhYmFzZTo6Y2xlYXJPYmpl Y3RTdG9yZUluQmFja2luZ1N0b3JlLCByZXF1ZXN0SUQsIGlkZW50aWZpZXIsIG9iamVjdFN0b3Jl SUQpKTsKIH0KIAotdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Y3JlYXRlSW5kZXgoY29uc3QgSURC VHJhbnNhY3Rpb25JZGVudGlmaWVyJiBpZGVudGlmaWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQs IGNvbnN0IFdlYkNvcmU6OklEQkluZGV4TWV0YWRhdGEmIGluZGV4TWV0YWRhdGEsIHN0ZDo6ZnVu Y3Rpb248dm9pZChib29sKT4gc3VjY2Vzc0NhbGxiYWNrKQordm9pZCBVbmlxdWVJREJEYXRhYmFz ZTo6Y3JlYXRlSW5kZXgoY29uc3QgSURCVHJhbnNhY3Rpb25JZGVudGlmaWVyJiBpZGVudGlmaWVy LCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGNvbnN0IFdlYkNvcmU6OklEQkluZGV4TWV0YWRhdGEm IG1ldGFkYXRhLCBzdGQ6OmZ1bmN0aW9uPHZvaWQoYm9vbCk+IHN1Y2Nlc3NDYWxsYmFjaykKIHsK ICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCkBAIC00NDMsMTcgKzQ0MywyOCBAQCB2b2lk IFVuaXF1ZUlEQkRhdGFiYXNlOjpjcmVhdGVJbmRleChjb25zdCBJREJUcmFuc2FjdGlvbklkZW50 aWZpZXImIGlkZW50aWZpZXIsCiAgICAgfQogCiAgICAgQVNTRVJUKG1fbWV0YWRhdGEtPm9iamVj dFN0b3Jlcy5jb250YWlucyhvYmplY3RTdG9yZUlEKSk7Ci0KLSAgICBSZWZQdHI8QXN5bmNSZXF1 ZXN0PiByZXF1ZXN0ID0gQXN5bmNSZXF1ZXN0SW1wbDxib29sPjo6Y3JlYXRlKFt0aGlzLCBzdWNj ZXNzQ2FsbGJhY2tdKGJvb2wgc3VjY2VzcykgeworICAgIEFTU0VSVCghbV9tZXRhZGF0YS0+b2Jq ZWN0U3RvcmVzLmdldChvYmplY3RTdG9yZUlEKS5pbmRleGVzLmNvbnRhaW5zKG1ldGFkYXRhLmlk KSk7CisgICAgbV9tZXRhZGF0YS0+b2JqZWN0U3RvcmVzLmdldChvYmplY3RTdG9yZUlEKS5pbmRl eGVzLnNldChtZXRhZGF0YS5pZCwgbWV0YWRhdGEpOworICAgIGludDY0X3QgYWRkZWRJbmRleElE ID0gbWV0YWRhdGEuaWQ7CisKKyAgICBSZWZQdHI8QXN5bmNSZXF1ZXN0PiByZXF1ZXN0ID0gQXN5 bmNSZXF1ZXN0SW1wbDxib29sPjo6Y3JlYXRlKFt0aGlzLCBvYmplY3RTdG9yZUlELCBhZGRlZElu ZGV4SUQsIHN1Y2Nlc3NDYWxsYmFja10oYm9vbCBzdWNjZXNzKSB7CisgICAgICAgIGlmICghc3Vj Y2VzcykgeworICAgICAgICAgICAgYXV0byBvYmplY3RTdG9yZUZpbmQgPSBtX21ldGFkYXRhLT5v YmplY3RTdG9yZXMuZmluZChvYmplY3RTdG9yZUlEKTsKKyAgICAgICAgICAgIGlmIChvYmplY3RT dG9yZUZpbmQgIT0gbV9tZXRhZGF0YS0+b2JqZWN0U3RvcmVzLmVuZCgpKQorICAgICAgICAgICAg ICAgIG9iamVjdFN0b3JlRmluZC0+dmFsdWUuaW5kZXhlcy5yZW1vdmUoYWRkZWRJbmRleElEKTsK KyAgICAgICAgfQogICAgICAgICBzdWNjZXNzQ2FsbGJhY2soc3VjY2Vzcyk7Ci0gICAgfSwgW3Ro aXMsIHN1Y2Nlc3NDYWxsYmFja10oKSB7CisgICAgfSwgW3RoaXMsIG9iamVjdFN0b3JlSUQsIGFk ZGVkSW5kZXhJRCwgc3VjY2Vzc0NhbGxiYWNrXSgpIHsKKyAgICAgICAgYXV0byBvYmplY3RTdG9y ZUZpbmQgPSBtX21ldGFkYXRhLT5vYmplY3RTdG9yZXMuZmluZChvYmplY3RTdG9yZUlEKTsKKyAg ICAgICAgaWYgKG9iamVjdFN0b3JlRmluZCAhPSBtX21ldGFkYXRhLT5vYmplY3RTdG9yZXMuZW5k KCkpCisgICAgICAgICAgICBvYmplY3RTdG9yZUZpbmQtPnZhbHVlLmluZGV4ZXMucmVtb3ZlKGFk ZGVkSW5kZXhJRCk7CiAgICAgICAgIHN1Y2Nlc3NDYWxsYmFjayhmYWxzZSk7CiAgICAgfSk7CiAK ICAgICB1aW50NjRfdCByZXF1ZXN0SUQgPSByZXF1ZXN0LT5yZXF1ZXN0SUQoKTsKICAgICBtX3Bl bmRpbmdEYXRhYmFzZVRhc2tzLmFkZChyZXF1ZXN0SUQsIHJlcXVlc3QucmVsZWFzZSgpKTsKIAot ICAgIHBvc3REYXRhYmFzZVRhc2soY3JlYXRlQXN5bmNUYXNrKCp0aGlzLCAmVW5pcXVlSURCRGF0 YWJhc2U6OmNyZWF0ZUluZGV4SW5CYWNraW5nU3RvcmUsIHJlcXVlc3RJRCwgaWRlbnRpZmllciwg b2JqZWN0U3RvcmVJRCwgaW5kZXhNZXRhZGF0YSkpOworICAgIHBvc3REYXRhYmFzZVRhc2soY3Jl YXRlQXN5bmNUYXNrKCp0aGlzLCAmVW5pcXVlSURCRGF0YWJhc2U6OmNyZWF0ZUluZGV4SW5CYWNr aW5nU3RvcmUsIHJlcXVlc3RJRCwgaWRlbnRpZmllciwgb2JqZWN0U3RvcmVJRCwgbWV0YWRhdGEp KTsKIH0KIAogdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlSW5kZXgoY29uc3QgSURCVHJh bnNhY3Rpb25JZGVudGlmaWVyJiBpZGVudGlmaWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGlu dDY0X3QgaW5kZXhJRCwgc3RkOjpmdW5jdGlvbjx2b2lkKGJvb2wpPiBzdWNjZXNzQ2FsbGJhY2sp CkBAIC00NjgsOSArNDc5LDE5IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmRlbGV0ZUluZGV4 KGNvbnN0IElEQlRyYW5zYWN0aW9uSWRlbnRpZmllciYgaWRlbnRpZmllciwKICAgICBBU1NFUlQo bV9tZXRhZGF0YS0+b2JqZWN0U3RvcmVzLmNvbnRhaW5zKG9iamVjdFN0b3JlSUQpKTsKICAgICBB U1NFUlQobV9tZXRhZGF0YS0+b2JqZWN0U3RvcmVzLmdldChvYmplY3RTdG9yZUlEKS5pbmRleGVz LmNvbnRhaW5zKGluZGV4SUQpKTsKIAotICAgIFJlZlB0cjxBc3luY1JlcXVlc3Q+IHJlcXVlc3Qg PSBBc3luY1JlcXVlc3RJbXBsPGJvb2w+OjpjcmVhdGUoW3RoaXMsIHN1Y2Nlc3NDYWxsYmFja10o Ym9vbCBzdWNjZXNzKSB7CisgICAgSURCSW5kZXhNZXRhZGF0YSBtZXRhZGF0YSA9IG1fbWV0YWRh dGEtPm9iamVjdFN0b3Jlcy5nZXQob2JqZWN0U3RvcmVJRCkuaW5kZXhlcy50YWtlKGluZGV4SUQp OworCisgICAgUmVmUHRyPEFzeW5jUmVxdWVzdD4gcmVxdWVzdCA9IEFzeW5jUmVxdWVzdEltcGw8 Ym9vbD46OmNyZWF0ZShbdGhpcywgb2JqZWN0U3RvcmVJRCwgbWV0YWRhdGEsIHN1Y2Nlc3NDYWxs YmFja10oYm9vbCBzdWNjZXNzKSB7CisgICAgICAgIGlmICghc3VjY2VzcykgeworICAgICAgICAg ICAgYXV0byBvYmplY3RTdG9yZUZpbmQgPSBtX21ldGFkYXRhLT5vYmplY3RTdG9yZXMuZmluZChv YmplY3RTdG9yZUlEKTsKKyAgICAgICAgICAgIGlmIChvYmplY3RTdG9yZUZpbmQgIT0gbV9tZXRh ZGF0YS0+b2JqZWN0U3RvcmVzLmVuZCgpKQorICAgICAgICAgICAgICAgIG9iamVjdFN0b3JlRmlu ZC0+dmFsdWUuaW5kZXhlcy5zZXQobWV0YWRhdGEuaWQsIG1ldGFkYXRhKTsKKyAgICAgICAgfQog ICAgICAgICBzdWNjZXNzQ2FsbGJhY2soc3VjY2Vzcyk7Ci0gICAgfSwgW3RoaXMsIHN1Y2Nlc3ND YWxsYmFja10oKSB7CisgICAgfSwgW3RoaXMsIG9iamVjdFN0b3JlSUQsIG1ldGFkYXRhLCBzdWNj ZXNzQ2FsbGJhY2tdKCkgeworICAgICAgICBhdXRvIG9iamVjdFN0b3JlRmluZCA9IG1fbWV0YWRh dGEtPm9iamVjdFN0b3Jlcy5maW5kKG9iamVjdFN0b3JlSUQpOworICAgICAgICBpZiAob2JqZWN0 U3RvcmVGaW5kICE9IG1fbWV0YWRhdGEtPm9iamVjdFN0b3Jlcy5lbmQoKSkKKyAgICAgICAgICAg IG9iamVjdFN0b3JlRmluZC0+dmFsdWUuaW5kZXhlcy5zZXQobWV0YWRhdGEuaWQsIG1ldGFkYXRh KTsKICAgICAgICAgc3VjY2Vzc0NhbGxiYWNrKGZhbHNlKTsKICAgICB9KTsKIApAQCAtNjE2LDE2 ICs2MzcsMjQgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Y2xlYXJPYmplY3RTdG9yZUluQmFj a2luZ1N0b3JlKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3QKICAgICBwb3N0TWFpblRocmVhZFRh c2soY3JlYXRlQXN5bmNUYXNrKCp0aGlzLCAmVW5pcXVlSURCRGF0YWJhc2U6OmRpZENsZWFyT2Jq ZWN0U3RvcmUsIHJlcXVlc3RJRCwgc3VjY2VzcykpOwogfQogCi12b2lkIFVuaXF1ZUlEQkRhdGFi YXNlOjpjcmVhdGVJbmRleEluQmFja2luZ1N0b3JlKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3Qg SURCVHJhbnNhY3Rpb25JZGVudGlmaWVyJiwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBjb25zdCBX ZWJDb3JlOjpJREJJbmRleE1ldGFkYXRhJikKK3ZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmNyZWF0 ZUluZGV4SW5CYWNraW5nU3RvcmUodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBJREJUcmFuc2Fj dGlvbklkZW50aWZpZXImIGlkZW50aWZpZXIsIGludDY0X3Qgb2JqZWN0U3RvcmVJRCwgY29uc3Qg V2ViQ29yZTo6SURCSW5kZXhNZXRhZGF0YSYgbWV0YWRhdGEpCiB7Ci0gICAgLy8gRklYTUU6IEFj dHVhbGx5IGNyZWF0ZSBpbiB0aGUgYmFja2luZyBzdG9yZS4KLSAgICBwb3N0TWFpblRocmVhZFRh c2soY3JlYXRlQXN5bmNUYXNrKCp0aGlzLCAmVW5pcXVlSURCRGF0YWJhc2U6OmRpZENyZWF0ZUlu ZGV4LCByZXF1ZXN0SUQsIGZhbHNlKSk7CisgICAgQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7Cisg ICAgQVNTRVJUKG1fYmFja2luZ1N0b3JlKTsKKworICAgIGJvb2wgc3VjY2VzcyA9IG1fYmFja2lu Z1N0b3JlLT5jcmVhdGVJbmRleChpZGVudGlmaWVyLCBvYmplY3RTdG9yZUlELCBtZXRhZGF0YSk7 CisKKyAgICBwb3N0TWFpblRocmVhZFRhc2soY3JlYXRlQXN5bmNUYXNrKCp0aGlzLCAmVW5pcXVl SURCRGF0YWJhc2U6OmRpZENyZWF0ZUluZGV4LCByZXF1ZXN0SUQsIHN1Y2Nlc3MpKTsKIH0KIAot dm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlSW5kZXhJbkJhY2tpbmdTdG9yZSh1aW50NjRf dCByZXF1ZXN0SUQsIGNvbnN0IElEQlRyYW5zYWN0aW9uSWRlbnRpZmllciYsIGludDY0X3Qgb2Jq ZWN0U3RvcmVJRCwgaW50NjRfdCBpbmRleElEKQordm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6ZGVs ZXRlSW5kZXhJbkJhY2tpbmdTdG9yZSh1aW50NjRfdCByZXF1ZXN0SUQsIGNvbnN0IElEQlRyYW5z YWN0aW9uSWRlbnRpZmllciYgaWRlbnRpZmllciwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBpbnQ2 NF90IGluZGV4SUQpCiB7Ci0gICAgLy8gRklYTUU6IEFjdHVhbGx5IGRlbGV0ZSBmcm9tIHRoZSBi YWNraW5nIHN0b3JlLgotICAgIHBvc3RNYWluVGhyZWFkVGFzayhjcmVhdGVBc3luY1Rhc2soKnRo aXMsICZVbmlxdWVJREJEYXRhYmFzZTo6ZGlkRGVsZXRlSW5kZXgsIHJlcXVlc3RJRCwgZmFsc2Up KTsKKyAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKKyAgICBBU1NFUlQobV9iYWNraW5nU3Rv cmUpOworCisgICAgYm9vbCBzdWNjZXNzID0gbV9iYWNraW5nU3RvcmUtPmRlbGV0ZUluZGV4KGlk ZW50aWZpZXIsIG9iamVjdFN0b3JlSUQsIGluZGV4SUQpOworCisgICAgcG9zdE1haW5UaHJlYWRU YXNrKGNyZWF0ZUFzeW5jVGFzaygqdGhpcywgJlVuaXF1ZUlEQkRhdGFiYXNlOjpkaWREZWxldGVJ bmRleCwgcmVxdWVzdElELCBzdWNjZXNzKSk7CiB9CiAKIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6 OnB1dFJlY29yZEluQmFja2luZ1N0b3JlKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgSURCVHJh bnNhY3Rpb25JZGVudGlmaWVyJiB0cmFuc2FjdGlvbiwgY29uc3QgSURCT2JqZWN0U3RvcmVNZXRh ZGF0YSYgb2JqZWN0U3RvcmVNZXRhZGF0YSwgY29uc3QgSURCS2V5RGF0YSYga2V5RGF0YSwgY29u c3QgVmVjdG9yPHVpbnQ4X3Q+JiB2YWx1ZSwgaW50NjRfdCBwdXRNb2RlLCBjb25zdCBWZWN0b3I8 aW50NjRfdD4mIGluZGV4SURzLCBjb25zdCBWZWN0b3I8VmVjdG9yPElEQktleURhdGE+PiYgaW5k ZXhLZXlzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4 ZWREQi9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZS5oIGIvU291cmNlL1dlYktpdDIvRGF0 YWJhc2VQcm9jZXNzL0luZGV4ZWREQi9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZS5oCmlu ZGV4IGEzMTNmMDcuLjY3M2I0NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNl UHJvY2Vzcy9JbmRleGVkREIvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmUuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9EYXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL1VuaXF1ZUlEQkRhdGFiYXNl QmFja2luZ1N0b3JlLmgKQEAgLTYwLDYgKzYwLDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9v bCBjcmVhdGVPYmplY3RTdG9yZShjb25zdCBJREJUcmFuc2FjdGlvbklkZW50aWZpZXImLCBjb25z dCBXZWJDb3JlOjpJREJPYmplY3RTdG9yZU1ldGFkYXRhJikgPSAwOwogICAgIHZpcnR1YWwgYm9v bCBkZWxldGVPYmplY3RTdG9yZShjb25zdCBJREJUcmFuc2FjdGlvbklkZW50aWZpZXImLCBpbnQ2 NF90IG9iamVjdFN0b3JlSUQpID0gMDsKICAgICB2aXJ0dWFsIGJvb2wgY2xlYXJPYmplY3RTdG9y ZShjb25zdCBJREJUcmFuc2FjdGlvbklkZW50aWZpZXImLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQp ID0gMDsKKyAgICB2aXJ0dWFsIGJvb2wgY3JlYXRlSW5kZXgoY29uc3QgSURCVHJhbnNhY3Rpb25J ZGVudGlmaWVyJiwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBjb25zdCBXZWJDb3JlOjpJREJJbmRl eE1ldGFkYXRhJikgPSAwOworICAgIHZpcnR1YWwgYm9vbCBkZWxldGVJbmRleChjb25zdCBJREJU cmFuc2FjdGlvbklkZW50aWZpZXImLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGludDY0X3QgaW5k ZXhJRCkgPSAwOwogCiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6OklEQktleT4gZ2Vu ZXJhdGVLZXkoY29uc3QgSURCVHJhbnNhY3Rpb25JZGVudGlmaWVyJiwgaW50NjRfdCBvYmplY3RT dG9yZUlEKSA9IDA7CiAgICAgdmlydHVhbCBib29sIGtleUV4aXN0c0luT2JqZWN0U3RvcmUoY29u c3QgSURCVHJhbnNhY3Rpb25JZGVudGlmaWVyJiwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBjb25z dCBXZWJDb3JlOjpJREJLZXkmLCBib29sJiBrZXlFeGlzdHMpID0gMDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRh dGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJv Y2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRl LmNwcAppbmRleCA1NDg2Yjg0Li5iNmQ5M2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9E YXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdT dG9yZVNRTGl0ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNzL0luZGV4 ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuY3BwCkBAIC00 MTMsNiArNDEzLDcgQEAgYm9vbCBVbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNRTGl0ZTo6 ZGVsZXRlT2JqZWN0U3RvcmUoY29uc3QgSURCVHJhbnNhY3Rpb24KICAgICAgICAgcmV0dXJuIGZh bHNlOwogICAgIH0KIAorICAgIC8vIERlbGV0ZSB0aGUgT2JqZWN0U3RvcmUgcmVjb3JkCiAgICAg ewogICAgICAgICBTUUxpdGVTdGF0ZW1lbnQgc3FsKCptX3NxbGl0ZURCLCBBU0NJSUxpdGVyYWwo IkRFTEVURSBGUk9NIE9iamVjdFN0b3JlSW5mbyBXSEVSRSBpZCA9ID87IikpOwogICAgICAgICBp ZiAoc3FsLnByZXBhcmUoKSAhPSBTUUxSZXN1bHRPawpAQCAtNDIyLDggKzQyMywzNCBAQCBib29s IFVuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlOjpkZWxldGVPYmplY3RTdG9yZShj b25zdCBJREJUcmFuc2FjdGlvbgogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9 CiAgICAgfQorCisgICAgLy8gRGVsZXRlIGFsbCBhc3NvY2lhdGVkIEluZGV4IHJlY29yZHMKICAg ICB7Ci0gICAgICAgIC8vIEZJWE1FOiBFeGVjdXRlIFNRTCBoZXJlIHRvIGRyb3AgYWxsIHJlY29y ZHMgYW5kIGluZGV4ZXMgcmVsYXRlZCB0byB0aGlzIG9iamVjdCBzdG9yZS4KKyAgICAgICAgVmVj dG9yPGludDY0X3Q+IGluZGV4SURzOworICAgICAgICBTUUxpdGVTdGF0ZW1lbnQgc3FsKCptX3Nx bGl0ZURCLCBBU0NJSUxpdGVyYWwoIlNFTEVDVCBpZCBGUk9NIEluZGV4SW5mbyBXSEVSRSBvYmpl Y3RTdG9yZUlEID0gPzsiKSk7CisgICAgICAgIGlmIChzcWwucHJlcGFyZSgpICE9IFNRTFJlc3Vs dE9rCisgICAgICAgICAgICB8fCBzcWwuYmluZEludDY0KDEsIG9iamVjdFN0b3JlSUQpICE9IFNR TFJlc3VsdE9rKSB7CisgICAgICAgICAgICBMT0dfRVJST1IoIkVycm9yIGZldGNoaW5nIGluZGV4 IElEIHJlY29yZHMgZm9yIG9iamVjdCBzdG9yZSBpZCAlbGxpIGZyb20gSW5kZXhJbmZvIHRhYmxl ICglaSkgLSAlcyIsIG9iamVjdFN0b3JlSUQsIG1fc3FsaXRlREItPmxhc3RFcnJvcigpLCBtX3Nx bGl0ZURCLT5sYXN0RXJyb3JNc2coKSk7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg ICAgIH0KKworICAgICAgICBpbnQgcmVzdWx0Q29kZTsKKyAgICAgICAgd2hpbGUgKChyZXN1bHRD b2RlID0gc3FsLnN0ZXAoKSkgPT0gU1FMUmVzdWx0Um93KQorICAgICAgICAgICAgaW5kZXhJRHMu YXBwZW5kKHNxbC5nZXRDb2x1bW5JbnQ2NCgwKSk7CisKKyAgICAgICAgaWYgKHJlc3VsdENvZGUg IT0gU1FMUmVzdWx0RG9uZSkgeworICAgICAgICAgICAgTE9HX0VSUk9SKCJFcnJvciBmZXRjaGlu ZyBpbmRleCBJRCByZWNvcmRzIGZvciBvYmplY3Qgc3RvcmUgaWQgJWxsaSBmcm9tIEluZGV4SW5m byB0YWJsZSAoJWkpIC0gJXMiLCBvYmplY3RTdG9yZUlELCBtX3NxbGl0ZURCLT5sYXN0RXJyb3Io KSwgbV9zcWxpdGVEQi0+bGFzdEVycm9yTXNnKCkpOworICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICB9CisKKyAgICAgICAgZm9yIChhdXRvIGluZGV4SUQgOiBpbmRleElEcykgewor ICAgICAgICAgICAgaWYgKCFkZWxldGVJbmRleChpZGVudGlmaWVyLCBvYmplY3RTdG9yZUlELCBp bmRleElEKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0KKyAgICB9 CisKKyAgICB7CisgICAgICAgIC8vIEZJWE1FOiBFeGVjdXRlIFNRTCBoZXJlIHRvIGRyb3AgYWxs IHJlY29yZHMgcmVsYXRlZCB0byB0aGlzIG9iamVjdCBzdG9yZS4KICAgICB9CiAKICAgICByZXR1 cm4gdHJ1ZTsKQEAgLTQ1OSw2ICs0ODYsNzUgQEAgYm9vbCBVbmlxdWVJREJEYXRhYmFzZUJhY2tp bmdTdG9yZVNRTGl0ZTo6Y2xlYXJPYmplY3RTdG9yZShjb25zdCBJREJUcmFuc2FjdGlvbkkKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAorYm9vbCBVbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdTdG9yZVNR TGl0ZTo6Y3JlYXRlSW5kZXgoY29uc3QgSURCVHJhbnNhY3Rpb25JZGVudGlmaWVyJiBpZGVudGlm aWVyLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGNvbnN0IFdlYkNvcmU6OklEQkluZGV4TWV0YWRh dGEmIG1ldGFkYXRhKQoreworICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOworICAgIEFTU0VS VChtX3NxbGl0ZURCKTsKKyAgICBBU1NFUlQobV9zcWxpdGVEQi0+aXNPcGVuKCkpOworCisgICAg U1FMaXRlSURCVHJhbnNhY3Rpb24qIHRyYW5zYWN0aW9uID0gbV90cmFuc2FjdGlvbnMuZ2V0KGlk ZW50aWZpZXIpOworICAgIGlmICghdHJhbnNhY3Rpb24gfHwgIXRyYW5zYWN0aW9uLT5pblByb2dy ZXNzKCkpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJBdHRlbXB0IHRvIGNyZWF0ZSBpbmRleCB3aXRo b3V0IGFuIGVzdGFibGlzaGVkLCBpbi1wcm9ncmVzcyB0cmFuc2FjdGlvbiIpOworICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgfQorICAgIGlmICh0cmFuc2FjdGlvbi0+bW9kZSgpICE9IEluZGV4 ZWREQjo6VHJhbnNhY3Rpb25Nb2RlOjpWZXJzaW9uQ2hhbmdlKSB7CisgICAgICAgIExPR19FUlJP UigiQXR0ZW1wdCB0byBjcmVhdGUgaW5kZXggZHVyaW5nIGEgbm9uLXZlcnNpb24tY2hhbmdlIHRy YW5zYWN0aW9uIik7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBSZWZQdHI8 U2hhcmVkQnVmZmVyPiBrZXlQYXRoQmxvYiA9IHNlcmlhbGl6ZUlEQktleVBhdGgobWV0YWRhdGEu a2V5UGF0aCk7CisgICAgaWYgKCFrZXlQYXRoQmxvYikgeworICAgICAgICBMT0dfRVJST1IoIlVu YWJsZSB0byBzZXJpYWxpemUgSURCS2V5UGF0aCB0byBzYXZlIGluIGRhdGFiYXNlIik7CisgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICBTUUxpdGVTdGF0ZW1lbnQgc3FsKCptX3Nx bGl0ZURCLCBBU0NJSUxpdGVyYWwoIklOU0VSVCBJTlRPIEluZGV4SW5mbyBWQUxVRVMgKD8sID8s ID8sID8sID8sID8pOyIpKTsKKyAgICBpZiAoc3FsLnByZXBhcmUoKSAhPSBTUUxSZXN1bHRPawor ICAgICAgICB8fCBzcWwuYmluZEludDY0KDEsIG1ldGFkYXRhLmlkKSAhPSBTUUxSZXN1bHRPawor ICAgICAgICB8fCBzcWwuYmluZFRleHQoMiwgbWV0YWRhdGEubmFtZSkgIT0gU1FMUmVzdWx0T2sK KyAgICAgICAgfHwgc3FsLmJpbmRJbnQ2NCgzLCBvYmplY3RTdG9yZUlEKSAhPSBTUUxSZXN1bHRP aworICAgICAgICB8fCBzcWwuYmluZEJsb2IoNCwga2V5UGF0aEJsb2ItPmRhdGEoKSwga2V5UGF0 aEJsb2ItPnNpemUoKSkgIT0gU1FMUmVzdWx0T2sKKyAgICAgICAgfHwgc3FsLmJpbmRJbnQoNSwg bWV0YWRhdGEudW5pcXVlKSAhPSBTUUxSZXN1bHRPaworICAgICAgICB8fCBzcWwuYmluZEludCg2 LCBtZXRhZGF0YS5tdWx0aUVudHJ5KSAhPSBTUUxSZXN1bHRPaworICAgICAgICB8fCBzcWwuc3Rl cCgpICE9IFNRTFJlc3VsdERvbmUpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJDb3VsZCBub3QgYWRk IGluZGV4ICclcycgdG8gSW5kZXhJbmZvIHRhYmxlICglaSkgLSAlcyIsIG1ldGFkYXRhLm5hbWUu dXRmOCgpLmRhdGEoKSwgbV9zcWxpdGVEQi0+bGFzdEVycm9yKCksIG1fc3FsaXRlREItPmxhc3RF cnJvck1zZygpKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIHJldHVybiB0 cnVlOworfQorCitib29sIFVuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlOjpkZWxl dGVJbmRleChjb25zdCBJREJUcmFuc2FjdGlvbklkZW50aWZpZXImIGlkZW50aWZpZXIsIGludDY0 X3Qgb2JqZWN0U3RvcmVJRCwgaW50NjRfdCBpbmRleElEKQoreworICAgIEFTU0VSVCghaXNNYWlu VGhyZWFkKCkpOworICAgIEFTU0VSVChtX3NxbGl0ZURCKTsKKyAgICBBU1NFUlQobV9zcWxpdGVE Qi0+aXNPcGVuKCkpOworCisgICAgU1FMaXRlSURCVHJhbnNhY3Rpb24qIHRyYW5zYWN0aW9uID0g bV90cmFuc2FjdGlvbnMuZ2V0KGlkZW50aWZpZXIpOworICAgIGlmICghdHJhbnNhY3Rpb24gfHwg IXRyYW5zYWN0aW9uLT5pblByb2dyZXNzKCkpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJBdHRlbXB0 IHRvIGRlbGV0ZSBpbmRleCB3aXRob3V0IGFuIGVzdGFibGlzaGVkLCBpbi1wcm9ncmVzcyB0cmFu c2FjdGlvbiIpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIGlmICh0cmFuc2Fj dGlvbi0+bW9kZSgpICE9IEluZGV4ZWREQjo6VHJhbnNhY3Rpb25Nb2RlOjpWZXJzaW9uQ2hhbmdl KSB7CisgICAgICAgIExPR19FUlJPUigiQXR0ZW1wdCB0byBkZWxldGUgaW5kZXggZHVyaW5nIGEg bm9uLXZlcnNpb24tY2hhbmdlIHRyYW5zYWN0aW9uIik7CisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICB9CisKKyAgICB7CisgICAgICAgIFNRTGl0ZVN0YXRlbWVudCBzcWwoKm1fc3FsaXRlREIs IEFTQ0lJTGl0ZXJhbCgiREVMRVRFIEZST00gSW5kZXhJbmZvIFdIRVJFIGlkID0gPyBBTkQgb2Jq ZWN0U3RvcmVJRCA9ID87IikpOworICAgICAgICBpZiAoc3FsLnByZXBhcmUoKSAhPSBTUUxSZXN1 bHRPaworICAgICAgICAgICAgfHwgc3FsLmJpbmRJbnQ2NCgxLCBpbmRleElEKSAhPSBTUUxSZXN1 bHRPaworICAgICAgICAgICAgfHwgc3FsLmJpbmRJbnQ2NCgyLCBvYmplY3RTdG9yZUlEKSAhPSBT UUxSZXN1bHRPaworICAgICAgICAgICAgfHwgc3FsLnN0ZXAoKSAhPSBTUUxSZXN1bHREb25lKSB7 CisgICAgICAgICAgICBMT0dfRVJST1IoIkNvdWxkIG5vdCBkZWxldGUgaW5kZXggaWQgJWxsaSBm cm9tIEluZGV4SW5mbyB0YWJsZSAoJWkpIC0gJXMiLCBvYmplY3RTdG9yZUlELCBtX3NxbGl0ZURC LT5sYXN0RXJyb3IoKSwgbV9zcWxpdGVEQi0+bGFzdEVycm9yTXNnKCkpOworICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICB9CisgICAgfQorCisgICAgLy8gRklYTUUgKDxyZGFyOi8v cHJvYmxlbS8xNTkwNTI5Mz4pIC0gT25jZSB3ZSBzdG9yZSByZWNvcmRzIGFnYWluc3QgaW5kZXhl cywgZGVsZXRlIHRoZW0gaGVyZS4KKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogUGFzc1JlZlB0cjxJ REJLZXk+IFVuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlOjpnZW5lcmF0ZUtleShj b25zdCBJREJUcmFuc2FjdGlvbklkZW50aWZpZXImLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQpCiB7 CiAgICAgLy8gRklYTUUgKDxyZGFyOi8vcHJvYmxlbS8xNTg3NzkwOT4pOiBJbXBsZW1lbnQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRl L1VuaXF1ZUlEQkRhdGFiYXNlQmFja2luZ1N0b3JlU1FMaXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9E YXRhYmFzZVByb2Nlc3MvSW5kZXhlZERCL3NxbGl0ZS9VbmlxdWVJREJEYXRhYmFzZUJhY2tpbmdT dG9yZVNRTGl0ZS5oCmluZGV4IDIyMmUyNGYuLjlkODJiMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL0RhdGFiYXNlUHJvY2Vzcy9JbmRleGVkREIvc3FsaXRlL1VuaXF1ZUlEQkRhdGFiYXNl QmFja2luZ1N0b3JlU1FMaXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvRGF0YWJhc2VQcm9jZXNz L0luZGV4ZWREQi9zcWxpdGUvVW5pcXVlSURCRGF0YWJhc2VCYWNraW5nU3RvcmVTUUxpdGUuaApA QCAtNjQsNiArNjQsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGNyZWF0ZU9iamVjdFN0 b3JlKGNvbnN0IElEQlRyYW5zYWN0aW9uSWRlbnRpZmllciYsIGNvbnN0IFdlYkNvcmU6OklEQk9i amVjdFN0b3JlTWV0YWRhdGEmKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGJvb2wgZGVsZXRlT2Jq ZWN0U3RvcmUoY29uc3QgSURCVHJhbnNhY3Rpb25JZGVudGlmaWVyJiwgaW50NjRfdCBvYmplY3RT dG9yZUlEKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGJvb2wgY2xlYXJPYmplY3RTdG9yZShjb25z dCBJREJUcmFuc2FjdGlvbklkZW50aWZpZXImLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQpIG92ZXJy aWRlOworICAgIHZpcnR1YWwgYm9vbCBjcmVhdGVJbmRleChjb25zdCBJREJUcmFuc2FjdGlvbklk ZW50aWZpZXImLCBpbnQ2NF90IG9iamVjdFN0b3JlSUQsIGNvbnN0IFdlYkNvcmU6OklEQkluZGV4 TWV0YWRhdGEmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIGJvb2wgZGVsZXRlSW5kZXgoY29uc3Qg SURCVHJhbnNhY3Rpb25JZGVudGlmaWVyJiwgaW50NjRfdCBvYmplY3RTdG9yZUlELCBpbnQ2NF90 IGluZGV4SUQpIG92ZXJyaWRlOwogCiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYkNvcmU6OklE QktleT4gZ2VuZXJhdGVLZXkoY29uc3QgSURCVHJhbnNhY3Rpb25JZGVudGlmaWVyJiwgaW50NjRf dCBvYmplY3RTdG9yZUlEKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGJvb2wga2V5RXhpc3RzSW5P YmplY3RTdG9yZShjb25zdCBJREJUcmFuc2FjdGlvbklkZW50aWZpZXImLCBpbnQ2NF90IG9iamVj dFN0b3JlSUQsIGNvbnN0IFdlYkNvcmU6OklEQktleSYsIGJvb2wmIGtleUV4aXN0cykgb3ZlcnJp ZGU7Cg==