196696 2019-04-08 10:08:28 -0700 Make IDB quota check lambdas take a weak of UniqueIDBDatabaseTransaction instead of a ref 2019-08-20 06:27:18 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen alecflett beidson commit-queue ews-watchlist jsbell sihui_liu webkit-bug-importer oldest_to_newest 1525221 0 youennf 2019-04-08 10:08:28 -0700 Make IDB quota check lambdas take a weak of UniqueIDBDatabaseTransaction instead of a ref 1525222 1 366945 youennf 2019-04-08 10:14:54 -0700 Created attachment 366945 Patch 1530236 2 youennf 2019-04-24 16:29:32 -0700 ping review 1563005 3 376759 youennf 2019-08-20 02:28:52 -0700 Created attachment 376759 Rebasing 1563043 4 376759 commit-queue 2019-08-20 06:26:12 -0700 Comment on attachment 376759 Rebasing Clearing flags on attachment: 376759 Committed r248899: <https://trac.webkit.org/changeset/248899> 1563044 5 commit-queue 2019-08-20 06:26:14 -0700 All reviewed patches have been landed. Closing bug. 1563045 6 webkit-bug-importer 2019-08-20 06:27:18 -0700 <rdar://problem/54509208> 366945 2019-04-08 10:14:54 -0700 2019-08-20 02:28:48 -0700 Patch bug-196696-20190408101454.patch text/plain 11953 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzODcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjUxMjJlZWJlZTZlODgw MWYzOTk2ZTQ4NGVmOWQ5ZTk5OTM1OGYzMi4uYTMzMWQ0YjBlZDlmYzc0MzViNWZkN2UzYTE3OTU4 MDcxZDcyNGY0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA0LTA4ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIElEQiBxdW90YSBj aGVjayBsYW1iZGFzIHRha2UgYSB3ZWFrIG9mIFVuaXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24g aW5zdGVhZCBvZiBhIHJlZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk2Njk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmVmaW5nIHRoZSB0cmFuc2FjdGlvbiBpbiB0aGUgbGFtYmRhcyBleHRlbmQgdGhl aXIgbGlmZXRpbWUuCisgICAgICAgIFRha2luZyBhIHdlYWsgcG9pbnRlciBvZiB0aGVtIGlzIGJl dHRlciBhcyB0aGlzIHdpbGwgbm90IGV4dGVuZCB0aGVpciBsaWZldGltZS4KKyAgICAgICAgSW4g cGFydGljdWxhciwgaWYgdGhlIGRhdGFiYXNlIGlzIGRlbGV0ZWQsIHRoZSBjb3JyZXNwb25kaW5n IHRyYW5zYWN0aW9ucyBtaWdodCBiZSBkZWxldGVkLgorICAgICAgICBUaGlzIG1ha2VzIHF1b3Rh IGNoZWNrcyBsZXNzIGludHJ1c2l2ZSBpbiBJREIgbGlmZXRpbWUgbWFuYWdlbWVudC4KKyAgICAg ICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIE1vZHVsZXMvaW5kZXhl ZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJT ZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpjcmVhdGVPYmplY3RTdG9yZSk6CisgICAgICAgIChX ZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpkZWxldGVPYmplY3RTdG9yZSk6 CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFiYXNlOjpyZW5hbWVP YmplY3RTdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpJREJTZXJ2ZXI6OlVuaXF1ZUlEQkRhdGFi YXNlOjpjbGVhck9iamVjdFN0b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5p cXVlSURCRGF0YWJhc2U6OmNyZWF0ZUluZGV4KToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZl cjo6VW5pcXVlSURCRGF0YWJhc2U6OmRlbGV0ZUluZGV4KToKKyAgICAgICAgKFdlYkNvcmU6OklE QlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OnJlbmFtZUluZGV4KToKKyAgICAgICAgKFdlYkNv cmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OmNvbW1pdFRyYW5zYWN0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OmFib3J0VHJhbnNh Y3Rpb24pOgorICAgICAgICAqIE1vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRh YmFzZVRyYW5zYWN0aW9uLmg6CisKIDIwMTktMDQtMDggIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdW1dLMV0gQVNTRVJUSU9OIEZBSUxFRDogbV9jcmVh dGlvblRocmVhZC5wdHIoKSA9PSAmVGhyZWFkOjpjdXJyZW50KCkgaW4gU2VydmljZVdvcmtlckNv bnRhaW5lcjo6flNlcnZpY2VXb3JrZXJDb250YWluZXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5j cHAKaW5kZXggY2U0OTA5YjllYWFlYzU3ZTFjZWNkY2JmYjJjNmQyNmI0YjE4NTJmMC4uMTg2MTIy YmE3NmFhMjg0N2QxNTcxMTMzYjRjODAxODM3YjQ4NDg2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJh c2UuY3BwCkBAIC03ODUsMTIgKzc4NSwxNiBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpjcmVh dGVPYmplY3RTdG9yZShVbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uJiB0cmFuc2FjdAogICAg IExPRyhJbmRleGVkREIsICIobWFpbikgVW5pcXVlSURCRGF0YWJhc2U6OmNyZWF0ZU9iamVjdFN0 b3JlIik7CiAKICAgICBhdXRvIHRhc2tTaXplID0gZGVmYXVsdFdyaXRlT3BlcmF0aW9uQ29zdCAr IGVzdGltYXRlU2l6ZShpbmZvKTsKLSAgICByZXF1ZXN0U3BhY2UodGFza1NpemUsICJjcmVhdGVP YmplY3RTdG9yZSIsIFt0aGlzLCB0YXNrU2l6ZSwgdHJhbnNhY3Rpb24gPSBtYWtlUmVmKHRyYW5z YWN0aW9uKSwgaW5mbywgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oYXV0byBlcnJvcikg bXV0YWJsZSB7CisgICAgcmVxdWVzdFNwYWNlKHRhc2tTaXplLCAiY3JlYXRlT2JqZWN0U3RvcmUi LCBbdGhpcywgdGFza1NpemUsIHRyYW5zYWN0aW9uID0gbWFrZVdlYWtQdHIodHJhbnNhY3Rpb24p LCBpbmZvLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXShhdXRvIGVycm9yKSBtdXRhYmxl IHsKICAgICAgICAgaWYgKGVycm9yKSB7CiAgICAgICAgICAgICBjYWxsYmFjayhXVEZNb3ZlKCpl cnJvcikpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIHRoaXMtPmNy ZWF0ZU9iamVjdFN0b3JlQWZ0ZXJRdW90YUNoZWNrKHRhc2tTaXplLCB0cmFuc2FjdGlvbi5nZXQo KSwgaW5mbywgV1RGTW92ZShjYWxsYmFjaykpOworICAgICAgICBpZiAoIXRyYW5zYWN0aW9uKSB7 CisgICAgICAgICAgICBjYWxsYmFjayhJREJFcnJvciB7IFVua25vd25FcnJvciB9KTsKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICB0aGlzLT5jcmVhdGVPYmplY3RTdG9y ZUFmdGVyUXVvdGFDaGVjayh0YXNrU2l6ZSwgKnRyYW5zYWN0aW9uLCBpbmZvLCBXVEZNb3ZlKGNh bGxiYWNrKSk7CiAgICAgfSk7CiB9CiAKQEAgLTgzMSwxMiArODM1LDE2IEBAIHZvaWQgVW5pcXVl SURCRGF0YWJhc2U6OmRlbGV0ZU9iamVjdFN0b3JlKFVuaXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rp b24mIHRyYW5zYWN0CiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBMT0coSW5kZXhl ZERCLCAiKG1haW4pIFVuaXF1ZUlEQkRhdGFiYXNlOjpkZWxldGVPYmplY3RTdG9yZSIpOwogCi0g ICAgd2FpdEZvclJlcXVlc3RTcGFjZUNvbXBsZXRpb24oW3RoaXMsIHRyYW5zYWN0aW9uID0gbWFr ZVJlZih0cmFuc2FjdGlvbiksIG9iamVjdFN0b3JlTmFtZSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNh bGxiYWNrKV0oYXV0byBlcnJvcikgbXV0YWJsZSB7CisgICAgd2FpdEZvclJlcXVlc3RTcGFjZUNv bXBsZXRpb24oW3RoaXMsIHRyYW5zYWN0aW9uID0gbWFrZVdlYWtQdHIodHJhbnNhY3Rpb24pLCBv YmplY3RTdG9yZU5hbWUsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGF1dG8gZXJyb3Ip IG11dGFibGUgewogICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgIGNhbGxiYWNrKFdU Rk1vdmUoKmVycm9yKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAg dGhpcy0+ZGVsZXRlT2JqZWN0U3RvcmVBZnRlclF1b3RhQ2hlY2sodHJhbnNhY3Rpb24sIG9iamVj dFN0b3JlTmFtZSwgV1RGTW92ZShjYWxsYmFjaykpOworICAgICAgICBpZiAoIXRyYW5zYWN0aW9u KSB7CisgICAgICAgICAgICBjYWxsYmFjayhJREJFcnJvciB7IFVua25vd25FcnJvciB9KTsKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICB0aGlzLT5kZWxldGVPYmplY3RT dG9yZUFmdGVyUXVvdGFDaGVjaygqdHJhbnNhY3Rpb24sIG9iamVjdFN0b3JlTmFtZSwgV1RGTW92 ZShjYWxsYmFjaykpOwogICAgIH0pOwogfQogCkBAIC04ODQsMTIgKzg5MiwxNiBAQCB2b2lkIFVu aXF1ZUlEQkRhdGFiYXNlOjpyZW5hbWVPYmplY3RTdG9yZShVbmlxdWVJREJEYXRhYmFzZVRyYW5z YWN0aW9uJiB0cmFuc2FjdAogICAgIExPRyhJbmRleGVkREIsICIobWFpbikgVW5pcXVlSURCRGF0 YWJhc2U6OnJlbmFtZU9iamVjdFN0b3JlIik7CiAKICAgICBhdXRvIHRhc2tTaXplID0gZGVmYXVs dFdyaXRlT3BlcmF0aW9uQ29zdCArIG5ld05hbWUuc2l6ZUluQnl0ZXMoKTsKLSAgICByZXF1ZXN0 U3BhY2UodGFza1NpemUsICJyZW5hbWVPYmplY3RTdG9yZSIsIFt0aGlzLCB0YXNrU2l6ZSwgdHJh bnNhY3Rpb24gPSBtYWtlUmVmKHRyYW5zYWN0aW9uKSwgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBu ZXdOYW1lLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXShhdXRvIGVycm9yKSBtdXRhYmxl IHsKKyAgICByZXF1ZXN0U3BhY2UodGFza1NpemUsICJyZW5hbWVPYmplY3RTdG9yZSIsIFt0aGlz LCB0YXNrU2l6ZSwgdHJhbnNhY3Rpb24gPSBtYWtlV2Vha1B0cih0cmFuc2FjdGlvbiksIG9iamVj dFN0b3JlSWRlbnRpZmllciwgbmV3TmFtZSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0o YXV0byBlcnJvcikgbXV0YWJsZSB7CiAgICAgICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAg Y2FsbGJhY2soV1RGTW92ZSgqZXJyb3IpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQotICAgICAgICB0aGlzLT5yZW5hbWVPYmplY3RTdG9yZUFmdGVyUXVvdGFDaGVjayh0YXNrU2l6 ZSwgdHJhbnNhY3Rpb24uZ2V0KCksIG9iamVjdFN0b3JlSWRlbnRpZmllciwgbmV3TmFtZSwgV1RG TW92ZShjYWxsYmFjaykpOworICAgICAgICBpZiAoIXRyYW5zYWN0aW9uKSB7CisgICAgICAgICAg ICBjYWxsYmFjayhJREJFcnJvciB7IFVua25vd25FcnJvciB9KTsKKyAgICAgICAgICAgIHJldHVy bjsKKyAgICAgICAgfQorICAgICAgICB0aGlzLT5yZW5hbWVPYmplY3RTdG9yZUFmdGVyUXVvdGFD aGVjayh0YXNrU2l6ZSwgKnRyYW5zYWN0aW9uLCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIG5ld05h bWUsIFdURk1vdmUoY2FsbGJhY2spKTsKICAgICB9KTsKIH0KIApAQCAtOTM2LDEyICs5NDgsMTYg QEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Y2xlYXJPYmplY3RTdG9yZShVbmlxdWVJREJEYXRh YmFzZVRyYW5zYWN0aW9uJiB0cmFuc2FjdGkKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwog ICAgIExPRyhJbmRleGVkREIsICIobWFpbikgVW5pcXVlSURCRGF0YWJhc2U6OmNsZWFyT2JqZWN0 U3RvcmUiKTsKIAotICAgIHdhaXRGb3JSZXF1ZXN0U3BhY2VDb21wbGV0aW9uKFt0aGlzLCB0cmFu c2FjdGlvbiA9IG1ha2VSZWYodHJhbnNhY3Rpb24pLCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGNh bGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGF1dG8gZXJyb3IpIG11dGFibGUgeworICAgIHdh aXRGb3JSZXF1ZXN0U3BhY2VDb21wbGV0aW9uKFt0aGlzLCB0cmFuc2FjdGlvbiA9IG1ha2VXZWFr UHRyKHRyYW5zYWN0aW9uKSwgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBjYWxsYmFjayA9IFdURk1v dmUoY2FsbGJhY2spXShhdXRvIGVycm9yKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKGVycm9yKSB7 CiAgICAgICAgICAgICBjYWxsYmFjayhXVEZNb3ZlKCplcnJvcikpOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9Ci0gICAgICAgIHRoaXMtPmNsZWFyT2JqZWN0U3RvcmVBZmV0UXVvdGFD aGVjayh0cmFuc2FjdGlvbiwgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBXVEZNb3ZlKGNhbGxiYWNr KSk7CisgICAgICAgIGlmICghdHJhbnNhY3Rpb24pIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKElE QkVycm9yIHsgVW5rbm93bkVycm9yIH0pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9 CisgICAgICAgIHRoaXMtPmNsZWFyT2JqZWN0U3RvcmVBZmV0UXVvdGFDaGVjaygqdHJhbnNhY3Rp b24sIG9iamVjdFN0b3JlSWRlbnRpZmllciwgV1RGTW92ZShjYWxsYmFjaykpOwogICAgIH0pOwog fQogCkBAIC05NzksMTIgKzk5NSwxNiBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpjcmVhdGVJ bmRleChVbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgYwogICAgIExP RyhJbmRleGVkREIsICIobWFpbikgVW5pcXVlSURCRGF0YWJhc2U6OmNyZWF0ZUluZGV4Iik7CiAK ICAgICBhdXRvIHRhc2tTaXplID0gZGVmYXVsdFdyaXRlT3BlcmF0aW9uQ29zdCArIGVzdGltYXRl U2l6ZShpbmZvKTsKLSAgICByZXF1ZXN0U3BhY2UodGFza1NpemUsICJjcmVhdGVJbmRleCIsIFt0 aGlzLCB0YXNrU2l6ZSwgdHJhbnNhY3Rpb24gPSBtYWtlUmVmKHRyYW5zYWN0aW9uKSwgaW5mbywg Y2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oYXV0byBlcnJvcikgbXV0YWJsZSB7CisgICAg cmVxdWVzdFNwYWNlKHRhc2tTaXplLCAiY3JlYXRlSW5kZXgiLCBbdGhpcywgdGFza1NpemUsIHRy YW5zYWN0aW9uID0gbWFrZVdlYWtQdHIodHJhbnNhY3Rpb24pLCBpbmZvLCBjYWxsYmFjayA9IFdU Rk1vdmUoY2FsbGJhY2spXShhdXRvIGVycm9yKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKGVycm9y KSB7CiAgICAgICAgICAgICBjYWxsYmFjayhXVEZNb3ZlKCplcnJvcikpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIHRoaXMtPmNyZWF0ZUluZGV4QWZ0ZXJRdW90YUNo ZWNrKHRhc2tTaXplLCB0cmFuc2FjdGlvbi5nZXQoKSwgaW5mbywgV1RGTW92ZShjYWxsYmFjaykp OworICAgICAgICBpZiAoIXRyYW5zYWN0aW9uKSB7CisgICAgICAgICAgICBjYWxsYmFjayhJREJF cnJvciB7IFVua25vd25FcnJvciB9KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQor ICAgICAgICB0aGlzLT5jcmVhdGVJbmRleEFmdGVyUXVvdGFDaGVjayh0YXNrU2l6ZSwgKnRyYW5z YWN0aW9uLCBpbmZvLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiAgICAgfSk7CiB9CiAKQEAgLTEwMzQs MTIgKzEwNTQsMTYgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlSW5kZXgoVW5pcXVl SURCRGF0YWJhc2VUcmFuc2FjdGlvbiYgdHJhbnNhY3Rpb24sIHUKICAgICBBU1NFUlQoaXNNYWlu VGhyZWFkKCkpOwogICAgIExPRyhJbmRleGVkREIsICIobWFpbikgVW5pcXVlSURCRGF0YWJhc2U6 OmRlbGV0ZUluZGV4Iik7CiAKLSAgICB3YWl0Rm9yUmVxdWVzdFNwYWNlQ29tcGxldGlvbihbdGhp cywgdHJhbnNhY3Rpb24gPSBtYWtlUmVmKHRyYW5zYWN0aW9uKSwgb2JqZWN0U3RvcmVJZGVudGlm aWVyLCBpbmRleE5hbWUsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGF1dG8gZXJyb3Ip IG11dGFibGUgeworICAgIHdhaXRGb3JSZXF1ZXN0U3BhY2VDb21wbGV0aW9uKFt0aGlzLCB0cmFu c2FjdGlvbiA9IG1ha2VXZWFrUHRyKHRyYW5zYWN0aW9uKSwgb2JqZWN0U3RvcmVJZGVudGlmaWVy LCBpbmRleE5hbWUsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGF1dG8gZXJyb3IpIG11 dGFibGUgewogICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgIGNhbGxiYWNrKFdURk1v dmUoKmVycm9yKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgdGhp cy0+ZGVsZXRlSW5kZXhBZnRlclF1b3RhQ2hlY2sodHJhbnNhY3Rpb24sIG9iamVjdFN0b3JlSWRl bnRpZmllciwgaW5kZXhOYW1lLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CisgICAgICAgIGlmICghdHJh bnNhY3Rpb24pIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKElEQkVycm9yIHsgVW5rbm93bkVycm9y IH0pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIHRoaXMtPmRlbGV0 ZUluZGV4QWZ0ZXJRdW90YUNoZWNrKCp0cmFuc2FjdGlvbiwgb2JqZWN0U3RvcmVJZGVudGlmaWVy LCBpbmRleE5hbWUsIFdURk1vdmUoY2FsbGJhY2spKTsKICAgICB9KTsKIH0KIApAQCAtMTA5Niwx MiArMTEyMCwxNiBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpyZW5hbWVJbmRleChVbmlxdWVJ REJEYXRhYmFzZVRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgdQogICAgIExPRyhJbmRleGVkREIs ICIobWFpbikgVW5pcXVlSURCRGF0YWJhc2U6OnJlbmFtZUluZGV4Iik7CiAKICAgICBhdXRvIHRh c2tTaXplID0gZGVmYXVsdFdyaXRlT3BlcmF0aW9uQ29zdCArIG5ld05hbWUuc2l6ZUluQnl0ZXMo KTsKLSAgICByZXF1ZXN0U3BhY2UodGFza1NpemUsICJyZW5hbWVJbmRleCIsIFt0aGlzLCB0YXNr U2l6ZSwgdHJhbnNhY3Rpb24gPSBtYWtlUmVmKHRyYW5zYWN0aW9uKSwgb2JqZWN0U3RvcmVJZGVu dGlmaWVyLCBpbmRleElkZW50aWZpZXIsIG5ld05hbWUsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxs YmFjayldKGF1dG8gZXJyb3IpIG11dGFibGUgeworICAgIHJlcXVlc3RTcGFjZSh0YXNrU2l6ZSwg InJlbmFtZUluZGV4IiwgW3RoaXMsIHRhc2tTaXplLCB0cmFuc2FjdGlvbiA9IG1ha2VXZWFrUHRy KHRyYW5zYWN0aW9uKSwgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBpbmRleElkZW50aWZpZXIsIG5l d05hbWUsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGF1dG8gZXJyb3IpIG11dGFibGUg ewogICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgIGNhbGxiYWNrKFdURk1vdmUoKmVy cm9yKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy0+cmVu YW1lSW5kZXhBZnRlclF1b3RhQ2hlY2sodGFza1NpemUsIHRyYW5zYWN0aW9uLmdldCgpLCBvYmpl Y3RTdG9yZUlkZW50aWZpZXIsIGluZGV4SWRlbnRpZmllciwgbmV3TmFtZSwgV1RGTW92ZShjYWxs YmFjaykpOworICAgICAgICBpZiAoIXRyYW5zYWN0aW9uKSB7CisgICAgICAgICAgICBjYWxsYmFj ayhJREJFcnJvciB7IFVua25vd25FcnJvciB9KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgICAgICB0aGlzLT5yZW5hbWVJbmRleEFmdGVyUXVvdGFDaGVjayh0YXNrU2l6ZSwg KnRyYW5zYWN0aW9uLCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGluZGV4SWRlbnRpZmllciwgbmV3 TmFtZSwgV1RGTW92ZShjYWxsYmFjaykpOwogICAgIH0pOwogfQogCkBAIC0xNTkwLDEyICsxNjE4 LDE2IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmNvbW1pdFRyYW5zYWN0aW9uKFVuaXF1ZUlE QkRhdGFiYXNlVHJhbnNhY3Rpb24mIHRyYW5zYWN0CiAKICAgICBBU1NFUlQodHJhbnNhY3Rpb24u ZGF0YWJhc2VDb25uZWN0aW9uKCkuZGF0YWJhc2UoKSA9PSB0aGlzKTsKIAotICAgIHdhaXRGb3JS ZXF1ZXN0U3BhY2VDb21wbGV0aW9uKFt0aGlzLCB0cmFuc2FjdGlvbiA9IG1ha2VSZWYodHJhbnNh Y3Rpb24pLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXShhdXRvIGVycm9yKSBtdXRhYmxl IHsKKyAgICB3YWl0Rm9yUmVxdWVzdFNwYWNlQ29tcGxldGlvbihbdGhpcywgdHJhbnNhY3Rpb24g PSBtYWtlV2Vha1B0cih0cmFuc2FjdGlvbiksIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayld KGF1dG8gZXJyb3IpIG11dGFibGUgewogICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAg IGNhbGxiYWNrKFdURk1vdmUoKmVycm9yKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KLSAgICAgICAgdGhpcy0+Y29tbWl0VHJhbnNhY3Rpb25BZnRlclF1b3RhQ2hlY2sodHJhbnNh Y3Rpb24sIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICAgICAgaWYgKCF0cmFuc2FjdGlvbikgewor ICAgICAgICAgICAgY2FsbGJhY2soSURCRXJyb3IgeyBVbmtub3duRXJyb3IgfSk7CisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgdGhpcy0+Y29tbWl0VHJhbnNhY3Rpb25B ZnRlclF1b3RhQ2hlY2soKnRyYW5zYWN0aW9uLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiAgICAgfSk7 CiB9CiAKQEAgLTE2NDYsMTIgKzE2NzgsMTYgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6YWJv cnRUcmFuc2FjdGlvbihVbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uJiB0cmFuc2FjdGkKICAg ICBBU1NFUlQodHJhbnNhY3Rpb24uZGF0YWJhc2VDb25uZWN0aW9uKCkuZGF0YWJhc2UoKSA9PSB0 aGlzKTsKIAogICAgIGlmICh3YWl0Rm9yUGVuZGluZ1Rhc2tzID09IFdhaXRGb3JQZW5kaW5nVGFz a3M6OlllcykgewotICAgICAgICB3YWl0Rm9yUmVxdWVzdFNwYWNlQ29tcGxldGlvbihbdGhpcywg dHJhbnNhY3Rpb24gPSBtYWtlUmVmKHRyYW5zYWN0aW9uKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNh bGxiYWNrKV0oYXV0byYmIGVycm9yKSBtdXRhYmxlIHsKKyAgICAgICAgd2FpdEZvclJlcXVlc3RT cGFjZUNvbXBsZXRpb24oW3RoaXMsIHRyYW5zYWN0aW9uID0gbWFrZVdlYWtQdHIodHJhbnNhY3Rp b24pLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXShhdXRvJiYgZXJyb3IpIG11dGFibGUg ewogICAgICAgICAgICAgaWYgKGVycm9yKSB7CiAgICAgICAgICAgICAgICAgY2FsbGJhY2soV1RG TW92ZSgqZXJyb3IpKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9Ci0g ICAgICAgICAgICB0aGlzLT5hYm9ydFRyYW5zYWN0aW9uKHRyYW5zYWN0aW9uLCBXYWl0Rm9yUGVu ZGluZ1Rhc2tzOjpObywgV1RGTW92ZShjYWxsYmFjaykpOworICAgICAgICAgICAgaWYgKCF0cmFu c2FjdGlvbikgeworICAgICAgICAgICAgICAgIGNhbGxiYWNrKElEQkVycm9yIHsgVW5rbm93bkVy cm9yIH0pOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIHRoaXMtPmFib3J0VHJhbnNhY3Rpb24oKnRyYW5zYWN0aW9uLCBXYWl0Rm9yUGVuZGluZ1Rh c2tzOjpObywgV1RGTW92ZShjYWxsYmFjaykpOwogICAgICAgICB9KTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL3Nl cnZlci9VbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbi5oCmluZGV4 IDUxMWQ1NzEyNDFkY2JlMjE0ZGY3YTcxYmEzYWEyNTBlYTY3MDg0MGMuLjM0YWE0NzRmYjlhNmMx ZmUyNWE1ZWIwYzZhOWFiZDMzMjliMDgwOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uLmgKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFi YXNlVHJhbnNhY3Rpb24uaApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIlVuaXF1ZUlEQkRh dGFiYXNlQ29ubmVjdGlvbi5oIgogI2luY2x1ZGUgPHd0Zi9SZWYuaD4KICNpbmNsdWRlIDx3dGYv UmVmQ291bnRlZC5oPgorI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIApAQCAtNTIsNyArNTMsNyBAQCBuYW1lc3BhY2UgSURCU2VydmVyIHsKIAogY2xhc3Mg VW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uOwogCi1jbGFzcyBVbmlxdWVJREJEYXRhYmFzZVRy YW5zYWN0aW9uIDogcHVibGljIFJlZkNvdW50ZWQ8VW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlv bj4geworY2xhc3MgVW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbiA6IHB1YmxpYyBSZWZDb3Vu dGVkPFVuaXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24+LCBwdWJsaWMgQ2FuTWFrZVdlYWtQdHI8 VW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbj4gewogcHVibGljOgogICAgIHN0YXRpYyBSZWY8 VW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbj4gY3JlYXRlKFVuaXF1ZUlEQkRhdGFiYXNlQ29u bmVjdGlvbiYsIGNvbnN0IElEQlRyYW5zYWN0aW9uSW5mbyYpOwogCg== 376759 2019-08-20 02:28:52 -0700 2019-08-20 06:26:12 -0700 Rebasing bug-196696-20190820112851.patch text/plain 11709 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4ODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTk3ZjZiNWZkZDkwMTNk MmNhODMwM2IzYjk1NGU4YzUwMzQxYTMxOS4uN2E3N2Y5NWNiYjliZTBjNmMxMTE1MGE2MDA3M2Mw MTU5N2MxZTI5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA4LTIwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIElEQiBxdW90YSBj aGVjayBsYW1iZGFzIHRha2UgYSB3ZWFrIG9mIFVuaXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24g aW5zdGVhZCBvZiBhIHJlZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTk2Njk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleCBDaHJpc3RlbnNlbi4K KworICAgICAgICBSZWZpbmcgdGhlIHRyYW5zYWN0aW9uIGluIHRoZSBsYW1iZGFzIGV4dGVuZCB0 aGVpciBsaWZldGltZS4KKyAgICAgICAgVGFraW5nIGEgd2VhayBwb2ludGVyIG9mIHRoZW0gaXMg YmV0dGVyIGFzIHRoaXMgd2lsbCBub3QgZXh0ZW5kIHRoZWlyIGxpZmV0aW1lLgorICAgICAgICBJ biBwYXJ0aWN1bGFyLCBpZiB0aGUgZGF0YWJhc2UgaXMgZGVsZXRlZCwgdGhlIGNvcnJlc3BvbmRp bmcgdHJhbnNhY3Rpb25zIG1pZ2h0IGJlIGRlbGV0ZWQuCisgICAgICAgIFRoaXMgbWFrZXMgcXVv dGEgY2hlY2tzIGxlc3MgaW50cnVzaXZlIGluIElEQiBsaWZldGltZSBtYW5hZ2VtZW50LgorICAg ICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogTW9kdWxlcy9pbmRl eGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OklE QlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OmNyZWF0ZU9iamVjdFN0b3JlKToKKyAgICAgICAg KFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OmRlbGV0ZU9iamVjdFN0b3Jl KToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0YWJhc2U6OnJlbmFt ZU9iamVjdFN0b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OklEQlNlcnZlcjo6VW5pcXVlSURCRGF0 YWJhc2U6OmNsZWFyT2JqZWN0U3RvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpV bmlxdWVJREJEYXRhYmFzZTo6Y3JlYXRlSW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2Vy dmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlSW5kZXgpOgorICAgICAgICAoV2ViQ29yZTo6 SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6cmVuYW1lSW5kZXgpOgorICAgICAgICAoV2Vi Q29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6Y29tbWl0VHJhbnNhY3Rpb24pOgor ICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6YWJvcnRUcmFu c2FjdGlvbik6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRh dGFiYXNlVHJhbnNhY3Rpb24uaDoKKwogMjAxOS0wOC0yMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CiAKICAgICAgICAgUGVuZGluZ0FjdGl2YXRpb25NZWRpYVN0cmVhbSBkb2Vz IG5vdCBuZWVkIHRvIGJlIHJlZmNvdW50ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCmluZGV4 IDlmM2FmMTEwOWU5ZDRkYmFmOTk5NDVjYTlkMjdmMzM4NzZhNDU3YmQuLmY3OTM5YmY2ZmRjYTNj MjQzNTMxOTY0ZDI0YjljMDMyM2RlMWFiNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcApA QCAtODAyLDEyICs4MDIsMTYgQEAgdm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Y3JlYXRlT2JqZWN0 U3RvcmUoVW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbiYgdHJhbnNhY3QKICAgICBMT0coSW5k ZXhlZERCLCAiKG1haW4pIFVuaXF1ZUlEQkRhdGFiYXNlOjpjcmVhdGVPYmplY3RTdG9yZSIpOwog CiAgICAgYXV0byB0YXNrU2l6ZSA9IGRlZmF1bHRXcml0ZU9wZXJhdGlvbkNvc3QgKyBlc3RpbWF0 ZVNpemUoaW5mbyk7Ci0gICAgcmVxdWVzdFNwYWNlKHRhc2tTaXplLCAiY3JlYXRlT2JqZWN0U3Rv cmUiLCBbdGhpcywgdGFza1NpemUsIHRyYW5zYWN0aW9uID0gbWFrZVJlZih0cmFuc2FjdGlvbiks IGluZm8sIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGF1dG8gZXJyb3IpIG11dGFibGUg eworICAgIHJlcXVlc3RTcGFjZSh0YXNrU2l6ZSwgImNyZWF0ZU9iamVjdFN0b3JlIiwgW3RoaXMs IHRhc2tTaXplLCB0cmFuc2FjdGlvbiA9IG1ha2VXZWFrUHRyKHRyYW5zYWN0aW9uKSwgaW5mbywg Y2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oYXV0byBlcnJvcikgbXV0YWJsZSB7CiAgICAg ICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAgY2FsbGJhY2soV1RGTW92ZSgqZXJyb3IpKTsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICB0aGlzLT5jcmVhdGVPYmpl Y3RTdG9yZUFmdGVyUXVvdGFDaGVjayh0YXNrU2l6ZSwgdHJhbnNhY3Rpb24uZ2V0KCksIGluZm8s IFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICAgICAgaWYgKCF0cmFuc2FjdGlvbikgeworICAgICAg ICAgICAgY2FsbGJhY2soSURCRXJyb3IgeyBVbmtub3duRXJyb3IgfSk7CisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgdGhpcy0+Y3JlYXRlT2JqZWN0U3RvcmVBZnRlclF1 b3RhQ2hlY2sodGFza1NpemUsICp0cmFuc2FjdGlvbiwgaW5mbywgV1RGTW92ZShjYWxsYmFjaykp OwogICAgIH0pOwogfQogCkBAIC04NDgsMTIgKzg1MiwxNiBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFi YXNlOjpkZWxldGVPYmplY3RTdG9yZShVbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uJiB0cmFu c2FjdAogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAgICAgTE9HKEluZGV4ZWREQiwgIiht YWluKSBVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRlT2JqZWN0U3RvcmUiKTsKIAotICAgIHdhaXRG b3JSZXF1ZXN0U3BhY2VDb21wbGV0aW9uKFt0aGlzLCB0cmFuc2FjdGlvbiA9IG1ha2VSZWYodHJh bnNhY3Rpb24pLCBvYmplY3RTdG9yZU5hbWUsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayld KGF1dG8gZXJyb3IpIG11dGFibGUgeworICAgIHdhaXRGb3JSZXF1ZXN0U3BhY2VDb21wbGV0aW9u KFt0aGlzLCB0cmFuc2FjdGlvbiA9IG1ha2VXZWFrUHRyKHRyYW5zYWN0aW9uKSwgb2JqZWN0U3Rv cmVOYW1lLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spXShhdXRvIGVycm9yKSBtdXRhYmxl IHsKICAgICAgICAgaWYgKGVycm9yKSB7CiAgICAgICAgICAgICBjYWxsYmFjayhXVEZNb3ZlKCpl cnJvcikpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIHRoaXMtPmRl bGV0ZU9iamVjdFN0b3JlQWZ0ZXJRdW90YUNoZWNrKHRyYW5zYWN0aW9uLCBvYmplY3RTdG9yZU5h bWUsIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICAgICAgaWYgKCF0cmFuc2FjdGlvbikgeworICAg ICAgICAgICAgY2FsbGJhY2soSURCRXJyb3IgeyBVbmtub3duRXJyb3IgfSk7CisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgdGhpcy0+ZGVsZXRlT2JqZWN0U3RvcmVBZnRl clF1b3RhQ2hlY2soKnRyYW5zYWN0aW9uLCBvYmplY3RTdG9yZU5hbWUsIFdURk1vdmUoY2FsbGJh Y2spKTsKICAgICB9KTsKIH0KIApAQCAtOTAxLDEyICs5MDksMTYgQEAgdm9pZCBVbmlxdWVJREJE YXRhYmFzZTo6cmVuYW1lT2JqZWN0U3RvcmUoVW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbiYg dHJhbnNhY3QKICAgICBMT0coSW5kZXhlZERCLCAiKG1haW4pIFVuaXF1ZUlEQkRhdGFiYXNlOjpy ZW5hbWVPYmplY3RTdG9yZSIpOwogCiAgICAgYXV0byB0YXNrU2l6ZSA9IGRlZmF1bHRXcml0ZU9w ZXJhdGlvbkNvc3QgKyBuZXdOYW1lLnNpemVJbkJ5dGVzKCk7Ci0gICAgcmVxdWVzdFNwYWNlKHRh c2tTaXplLCAicmVuYW1lT2JqZWN0U3RvcmUiLCBbdGhpcywgdGFza1NpemUsIHRyYW5zYWN0aW9u ID0gbWFrZVJlZih0cmFuc2FjdGlvbiksIG9iamVjdFN0b3JlSWRlbnRpZmllciwgbmV3TmFtZSwg Y2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oYXV0byBlcnJvcikgbXV0YWJsZSB7CisgICAg cmVxdWVzdFNwYWNlKHRhc2tTaXplLCAicmVuYW1lT2JqZWN0U3RvcmUiLCBbdGhpcywgdGFza1Np emUsIHRyYW5zYWN0aW9uID0gbWFrZVdlYWtQdHIodHJhbnNhY3Rpb24pLCBvYmplY3RTdG9yZUlk ZW50aWZpZXIsIG5ld05hbWUsIGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGF1dG8gZXJy b3IpIG11dGFibGUgewogICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgIGNhbGxiYWNr KFdURk1vdmUoKmVycm9yKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAg ICAgdGhpcy0+cmVuYW1lT2JqZWN0U3RvcmVBZnRlclF1b3RhQ2hlY2sodGFza1NpemUsIHRyYW5z YWN0aW9uLmdldCgpLCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIG5ld05hbWUsIFdURk1vdmUoY2Fs bGJhY2spKTsKKyAgICAgICAgaWYgKCF0cmFuc2FjdGlvbikgeworICAgICAgICAgICAgY2FsbGJh Y2soSURCRXJyb3IgeyBVbmtub3duRXJyb3IgfSk7CisgICAgICAgICAgICByZXR1cm47CisgICAg ICAgIH0KKyAgICAgICAgdGhpcy0+cmVuYW1lT2JqZWN0U3RvcmVBZnRlclF1b3RhQ2hlY2sodGFz a1NpemUsICp0cmFuc2FjdGlvbiwgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBuZXdOYW1lLCBXVEZN b3ZlKGNhbGxiYWNrKSk7CiAgICAgfSk7CiB9CiAKQEAgLTk1MywxMiArOTY1LDE2IEBAIHZvaWQg VW5pcXVlSURCRGF0YWJhc2U6OmNsZWFyT2JqZWN0U3RvcmUoVW5pcXVlSURCRGF0YWJhc2VUcmFu c2FjdGlvbiYgdHJhbnNhY3RpCiAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICBMT0co SW5kZXhlZERCLCAiKG1haW4pIFVuaXF1ZUlEQkRhdGFiYXNlOjpjbGVhck9iamVjdFN0b3JlIik7 CiAKLSAgICB3YWl0Rm9yUmVxdWVzdFNwYWNlQ29tcGxldGlvbihbdGhpcywgdHJhbnNhY3Rpb24g PSBtYWtlUmVmKHRyYW5zYWN0aW9uKSwgb2JqZWN0U3RvcmVJZGVudGlmaWVyLCBjYWxsYmFjayA9 IFdURk1vdmUoY2FsbGJhY2spXShhdXRvIGVycm9yKSBtdXRhYmxlIHsKKyAgICB3YWl0Rm9yUmVx dWVzdFNwYWNlQ29tcGxldGlvbihbdGhpcywgdHJhbnNhY3Rpb24gPSBtYWtlV2Vha1B0cih0cmFu c2FjdGlvbiksIG9iamVjdFN0b3JlSWRlbnRpZmllciwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxi YWNrKV0oYXV0byBlcnJvcikgbXV0YWJsZSB7CiAgICAgICAgIGlmIChlcnJvcikgewogICAgICAg ICAgICAgY2FsbGJhY2soV1RGTW92ZSgqZXJyb3IpKTsKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQotICAgICAgICB0aGlzLT5jbGVhck9iamVjdFN0b3JlQWZldFF1b3RhQ2hlY2sodHJh bnNhY3Rpb24sIG9iamVjdFN0b3JlSWRlbnRpZmllciwgV1RGTW92ZShjYWxsYmFjaykpOworICAg ICAgICBpZiAoIXRyYW5zYWN0aW9uKSB7CisgICAgICAgICAgICBjYWxsYmFjayhJREJFcnJvciB7 IFVua25vd25FcnJvciB9KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAg ICB0aGlzLT5jbGVhck9iamVjdFN0b3JlQWZldFF1b3RhQ2hlY2soKnRyYW5zYWN0aW9uLCBvYmpl Y3RTdG9yZUlkZW50aWZpZXIsIFdURk1vdmUoY2FsbGJhY2spKTsKICAgICB9KTsKIH0KIApAQCAt OTk2LDEyICsxMDEyLDE2IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmNyZWF0ZUluZGV4KFVu aXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24mIHRyYW5zYWN0aW9uLCBjCiAgICAgTE9HKEluZGV4 ZWREQiwgIihtYWluKSBVbmlxdWVJREJEYXRhYmFzZTo6Y3JlYXRlSW5kZXgiKTsKIAogICAgIGF1 dG8gdGFza1NpemUgPSBkZWZhdWx0V3JpdGVPcGVyYXRpb25Db3N0ICsgZXN0aW1hdGVTaXplKGlu Zm8pOwotICAgIHJlcXVlc3RTcGFjZSh0YXNrU2l6ZSwgImNyZWF0ZUluZGV4IiwgW3RoaXMsIHRh c2tTaXplLCB0cmFuc2FjdGlvbiA9IG1ha2VSZWYodHJhbnNhY3Rpb24pLCBpbmZvLCBjYWxsYmFj ayA9IFdURk1vdmUoY2FsbGJhY2spXShhdXRvIGVycm9yKSBtdXRhYmxlIHsKKyAgICByZXF1ZXN0 U3BhY2UodGFza1NpemUsICJjcmVhdGVJbmRleCIsIFt0aGlzLCB0YXNrU2l6ZSwgdHJhbnNhY3Rp b24gPSBtYWtlV2Vha1B0cih0cmFuc2FjdGlvbiksIGluZm8sIGNhbGxiYWNrID0gV1RGTW92ZShj YWxsYmFjayldKGF1dG8gZXJyb3IpIG11dGFibGUgewogICAgICAgICBpZiAoZXJyb3IpIHsKICAg ICAgICAgICAgIGNhbGxiYWNrKFdURk1vdmUoKmVycm9yKSk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KLSAgICAgICAgdGhpcy0+Y3JlYXRlSW5kZXhBZnRlclF1b3RhQ2hlY2sodGFz a1NpemUsIHRyYW5zYWN0aW9uLmdldCgpLCBpbmZvLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CisgICAg ICAgIGlmICghdHJhbnNhY3Rpb24pIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKElEQkVycm9yIHsg VW5rbm93bkVycm9yIH0pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAg IHRoaXMtPmNyZWF0ZUluZGV4QWZ0ZXJRdW90YUNoZWNrKHRhc2tTaXplLCAqdHJhbnNhY3Rpb24s IGluZm8sIFdURk1vdmUoY2FsbGJhY2spKTsKICAgICB9KTsKIH0KIApAQCAtMTA1MSwxMiArMTA3 MSwxNiBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjpkZWxldGVJbmRleChVbmlxdWVJREJEYXRh YmFzZVRyYW5zYWN0aW9uJiB0cmFuc2FjdGlvbiwgdQogICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7CiAgICAgTE9HKEluZGV4ZWREQiwgIihtYWluKSBVbmlxdWVJREJEYXRhYmFzZTo6ZGVsZXRl SW5kZXgiKTsKIAotICAgIHdhaXRGb3JSZXF1ZXN0U3BhY2VDb21wbGV0aW9uKFt0aGlzLCB0cmFu c2FjdGlvbiA9IG1ha2VSZWYodHJhbnNhY3Rpb24pLCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGlu ZGV4TmFtZSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oYXV0byBlcnJvcikgbXV0YWJs ZSB7CisgICAgd2FpdEZvclJlcXVlc3RTcGFjZUNvbXBsZXRpb24oW3RoaXMsIHRyYW5zYWN0aW9u ID0gbWFrZVdlYWtQdHIodHJhbnNhY3Rpb24pLCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGluZGV4 TmFtZSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oYXV0byBlcnJvcikgbXV0YWJsZSB7 CiAgICAgICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAgY2FsbGJhY2soV1RGTW92ZSgqZXJy b3IpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICB0aGlzLT5kZWxl dGVJbmRleEFmdGVyUXVvdGFDaGVjayh0cmFuc2FjdGlvbiwgb2JqZWN0U3RvcmVJZGVudGlmaWVy LCBpbmRleE5hbWUsIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICAgICAgaWYgKCF0cmFuc2FjdGlv bikgeworICAgICAgICAgICAgY2FsbGJhY2soSURCRXJyb3IgeyBVbmtub3duRXJyb3IgfSk7Cisg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgdGhpcy0+ZGVsZXRlSW5kZXhB ZnRlclF1b3RhQ2hlY2soKnRyYW5zYWN0aW9uLCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGluZGV4 TmFtZSwgV1RGTW92ZShjYWxsYmFjaykpOwogICAgIH0pOwogfQogCkBAIC0xMTEzLDEyICsxMTM3 LDE2IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OnJlbmFtZUluZGV4KFVuaXF1ZUlEQkRhdGFi YXNlVHJhbnNhY3Rpb24mIHRyYW5zYWN0aW9uLCB1CiAgICAgTE9HKEluZGV4ZWREQiwgIihtYWlu KSBVbmlxdWVJREJEYXRhYmFzZTo6cmVuYW1lSW5kZXgiKTsKIAogICAgIGF1dG8gdGFza1NpemUg PSBkZWZhdWx0V3JpdGVPcGVyYXRpb25Db3N0ICsgbmV3TmFtZS5zaXplSW5CeXRlcygpOwotICAg IHJlcXVlc3RTcGFjZSh0YXNrU2l6ZSwgInJlbmFtZUluZGV4IiwgW3RoaXMsIHRhc2tTaXplLCB0 cmFuc2FjdGlvbiA9IG1ha2VSZWYodHJhbnNhY3Rpb24pLCBvYmplY3RTdG9yZUlkZW50aWZpZXIs IGluZGV4SWRlbnRpZmllciwgbmV3TmFtZSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0o YXV0byBlcnJvcikgbXV0YWJsZSB7CisgICAgcmVxdWVzdFNwYWNlKHRhc2tTaXplLCAicmVuYW1l SW5kZXgiLCBbdGhpcywgdGFza1NpemUsIHRyYW5zYWN0aW9uID0gbWFrZVdlYWtQdHIodHJhbnNh Y3Rpb24pLCBvYmplY3RTdG9yZUlkZW50aWZpZXIsIGluZGV4SWRlbnRpZmllciwgbmV3TmFtZSwg Y2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oYXV0byBlcnJvcikgbXV0YWJsZSB7CiAgICAg ICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAgY2FsbGJhY2soV1RGTW92ZSgqZXJyb3IpKTsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICB0aGlzLT5yZW5hbWVJbmRl eEFmdGVyUXVvdGFDaGVjayh0YXNrU2l6ZSwgdHJhbnNhY3Rpb24uZ2V0KCksIG9iamVjdFN0b3Jl SWRlbnRpZmllciwgaW5kZXhJZGVudGlmaWVyLCBuZXdOYW1lLCBXVEZNb3ZlKGNhbGxiYWNrKSk7 CisgICAgICAgIGlmICghdHJhbnNhY3Rpb24pIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKElEQkVy cm9yIHsgVW5rbm93bkVycm9yIH0pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9Cisg ICAgICAgIHRoaXMtPnJlbmFtZUluZGV4QWZ0ZXJRdW90YUNoZWNrKHRhc2tTaXplLCAqdHJhbnNh Y3Rpb24sIG9iamVjdFN0b3JlSWRlbnRpZmllciwgaW5kZXhJZGVudGlmaWVyLCBuZXdOYW1lLCBX VEZNb3ZlKGNhbGxiYWNrKSk7CiAgICAgfSk7CiB9CiAKQEAgLTE1OTEsMTIgKzE2MTksMTYgQEAg dm9pZCBVbmlxdWVJREJEYXRhYmFzZTo6Y29tbWl0VHJhbnNhY3Rpb24oVW5pcXVlSURCRGF0YWJh c2VUcmFuc2FjdGlvbiYgdHJhbnNhY3QKIAogICAgIEFTU0VSVCh0cmFuc2FjdGlvbi5kYXRhYmFz ZUNvbm5lY3Rpb24oKS5kYXRhYmFzZSgpID09IHRoaXMpOwogCi0gICAgd2FpdEZvclJlcXVlc3RT cGFjZUNvbXBsZXRpb24oW3RoaXMsIHRyYW5zYWN0aW9uID0gbWFrZVJlZih0cmFuc2FjdGlvbiks IGNhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGF1dG8gZXJyb3IpIG11dGFibGUgeworICAg IHdhaXRGb3JSZXF1ZXN0U3BhY2VDb21wbGV0aW9uKFt0aGlzLCB0cmFuc2FjdGlvbiA9IG1ha2VX ZWFrUHRyKHRyYW5zYWN0aW9uKSwgY2FsbGJhY2sgPSBXVEZNb3ZlKGNhbGxiYWNrKV0oYXV0byBl cnJvcikgbXV0YWJsZSB7CiAgICAgICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAgY2FsbGJh Y2soV1RGTW92ZSgqZXJyb3IpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAg ICAgICB0aGlzLT5jb21taXRUcmFuc2FjdGlvbkFmdGVyUXVvdGFDaGVjayh0cmFuc2FjdGlvbiwg V1RGTW92ZShjYWxsYmFjaykpOworICAgICAgICBpZiAoIXRyYW5zYWN0aW9uKSB7CisgICAgICAg ICAgICBjYWxsYmFjayhJREJFcnJvciB7IFVua25vd25FcnJvciB9KTsKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgfQorICAgICAgICB0aGlzLT5jb21taXRUcmFuc2FjdGlvbkFmdGVyUXVv dGFDaGVjaygqdHJhbnNhY3Rpb24sIFdURk1vdmUoY2FsbGJhY2spKTsKICAgICB9KTsKIH0KIApA QCAtMTY2MywxMiArMTY5NSwxNiBAQCB2b2lkIFVuaXF1ZUlEQkRhdGFiYXNlOjphYm9ydFRyYW5z YWN0aW9uKFVuaXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24mIHRyYW5zYWN0aQogICAgIEFTU0VS VCh0cmFuc2FjdGlvbi5kYXRhYmFzZUNvbm5lY3Rpb24oKS5kYXRhYmFzZSgpID09IHRoaXMpOwog CiAgICAgaWYgKHdhaXRGb3JQZW5kaW5nVGFza3MgPT0gV2FpdEZvclBlbmRpbmdUYXNrczo6WWVz KSB7Ci0gICAgICAgIHdhaXRGb3JSZXF1ZXN0U3BhY2VDb21wbGV0aW9uKFt0aGlzLCB0cmFuc2Fj dGlvbiA9IG1ha2VSZWYodHJhbnNhY3Rpb24pLCBjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2sp XShhdXRvJiYgZXJyb3IpIG11dGFibGUgeworICAgICAgICB3YWl0Rm9yUmVxdWVzdFNwYWNlQ29t cGxldGlvbihbdGhpcywgdHJhbnNhY3Rpb24gPSBtYWtlV2Vha1B0cih0cmFuc2FjdGlvbiksIGNh bGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayldKGF1dG8mJiBlcnJvcikgbXV0YWJsZSB7CiAgICAg ICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgICAgICBjYWxsYmFjayhXVEZNb3ZlKCpl cnJvcikpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIHRoaXMtPmFib3J0VHJhbnNhY3Rpb24odHJhbnNhY3Rpb24sIFdhaXRGb3JQZW5kaW5nVGFz a3M6Ok5vLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CisgICAgICAgICAgICBpZiAoIXRyYW5zYWN0aW9u KSB7CisgICAgICAgICAgICAgICAgY2FsbGJhY2soSURCRXJyb3IgeyBVbmtub3duRXJyb3IgfSk7 CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorICAgICAgICAgICAgdGhp cy0+YWJvcnRUcmFuc2FjdGlvbigqdHJhbnNhY3Rpb24sIFdhaXRGb3JQZW5kaW5nVGFza3M6Ok5v LCBXVEZNb3ZlKGNhbGxiYWNrKSk7CiAgICAgICAgIH0pOwogICAgICAgICByZXR1cm47CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1Vu aXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24uaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5k ZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uLmgKaW5kZXggOGQ4ZDhk MjJiNDRlZTBkZDFkM2FmZGFiNDFmMDM2YzViYzZjNjFkNi4uZTZjYTFmMDYwN2EyOTM1ZmZlMGM5 YWRlMWVhZmI4NDNmODI2ZmRlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2VUcmFu c2FjdGlvbi5oCkBAIC01Myw3ICs1Myw3IEBAIG5hbWVzcGFjZSBJREJTZXJ2ZXIgewogY2xhc3Mg SURCU2VydmVyOwogY2xhc3MgVW5pcXVlSURCRGF0YWJhc2VDb25uZWN0aW9uOwogCi1jbGFzcyBV bmlxdWVJREJEYXRhYmFzZVRyYW5zYWN0aW9uIDogcHVibGljIFJlZkNvdW50ZWQ8VW5pcXVlSURC RGF0YWJhc2VUcmFuc2FjdGlvbj4geworY2xhc3MgVW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlv biA6IHB1YmxpYyBSZWZDb3VudGVkPFVuaXF1ZUlEQkRhdGFiYXNlVHJhbnNhY3Rpb24+LCBwdWJs aWMgQ2FuTWFrZVdlYWtQdHI8VW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlvbj4gewogcHVibGlj OgogICAgIGVudW0gY2xhc3MgU3RhdGUgeyBSdW5uaW5nLCBBYm9ydGluZywgQ29tbWl0dGluZywg QWJvcnRlZCwgQ29tbWl0dGVkIH07CiAK