218731 2020-11-09 16:39:04 -0800 Exceptions under PlatformCALayerCocoa::drawLayerContents with DisplayList-backed layers 2020-11-09 23:43:17 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton ews-watchlist mmaxfield sabouhallawa simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1705940 0 thorton 2020-11-09 16:39:04 -0800 Exceptions under PlatformCALayerCocoa::drawLayerContents with DisplayList-backed layers 1705941 1 413643 thorton 2020-11-09 16:39:12 -0800 Created attachment 413643 Patch 1705947 2 413647 thorton 2020-11-09 16:54:51 -0800 Created attachment 413647 Patch 1705952 3 413649 thorton 2020-11-09 17:48:38 -0800 Created attachment 413649 Patch 1705953 4 thorton 2020-11-09 18:02:10 -0800 Apparently I'm going to have to build for iOS :D 1705954 5 413650 thorton 2020-11-09 18:11:18 -0800 Created attachment 413650 Patch 1705955 6 413651 thorton 2020-11-09 18:13:23 -0800 Created attachment 413651 Patch 1705999 7 413651 thorton 2020-11-09 23:28:45 -0800 Comment on attachment 413651 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=413651&action=review > Source/WebCore/platform/graphics/ios/FontAntialiasingStateSaver.h:52 > +#if !PLATFORM(IOS_FAMILY_SIMULATOR) Also, does anybody recall why this is not compiled on sim?? That seems very odd. 1706000 8 ews-feeder 2020-11-09 23:42:53 -0800 Committed r269616: <https://trac.webkit.org/changeset/269616> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413651. 1706001 9 webkit-bug-importer 2020-11-09 23:43:17 -0800 <rdar://problem/71227714> 413643 2020-11-09 16:39:12 -0800 2020-11-09 16:55:49 -0800 Patch bug-218731-20201109163911.patch text/plain 8809 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEwOTQ2YThhNGEwZDkw ZjJkNzRjZTAwOWYxNmMxNTMzZjI3ZjJiNC4uMmQ1M2E1ZjU2NmExODY4MTIzZTIzYzNhODY4MmJl N2FjNmJlNjFlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEV4Y2VwdGlvbnMg dW5kZXIgUGxhdGZvcm1DQUxheWVyQ29jb2E6OmRyYXdMYXllckNvbnRlbnRzIHdpdGggRGlzcGxh eUxpc3QtYmFja2VkIGxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTm8gbmV3IHRlc3RzOyBhbGwgdGVzdHMgd2lsbCBjb3ZlciB0aGlzIG9uY2Ug R1BVIFByb2Nlc3MgZm9yIERPTSByZW5kZXJpbmcgbGFuZHMuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbToKKyAgICAgICAgKFdl YkNvcmU6OlBsYXRmb3JtQ0FMYXllcjo6ZHJhd0xheWVyQ29udGVudHMpOgorICAgICAgICBSZWZh Y3RvciB0aGlzIGZ1bmN0aW9uIHRvIHVzZSB0aHJlZSBzdGF0ZSBzYXZlcnMsIGFsbCByZWxlYXNl ZCBieSBzY29wZSBpbnN0ZWFkIG9mIGV4cGxpY2l0bHkuCisgICAgICAgIFRoaXMgZml4ZXMgdGhl IGJ1ZyBpbiB0aGUgdGl0bGUsIHdoaWNoIHdhcyB0aGF0IHdlIHdvdWxkIGNhbGwgK3Jlc3RvcmVH cmFwaGljc1N0YXRlIG9uIE5TR3JhcGhpY3NDb250ZXh0CisgICAgICAgIHJlZ2FyZGxlc3Mgb2Yg d2hldGhlciB3ZSBoYXZlIGEgcGxhdGZvcm0gY29udGV4dCBvciBub3QgKHdoaWxlIHdlJ2Qgb25s eSBzYXZlIGlmIHdlIC9kaWQvIGhhdmUgb25lKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXI6On5Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlcik6 CisgICAgICAgIChXZWJDb3JlOjpGb250QW50aWFsaWFzaW5nU3RhdGVTYXZlcjo6cmVzdG9yZSk6 IERlbGV0ZWQuCisgICAgICAgIE1ha2UgRm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIgYmVoYXZl IGxpa2UgYWxsIG9mIHRoZSBvdGhlciAtU3RhdGVTYXZlcnMsIHBlcmZvcm1pbmcgInJlc3RvcmUi CisgICAgICAgIGluIGl0cyBkZXN0cnVjdG9yLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL0xl Z2FjeVRpbGVDYWNoZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVRpbGVDYWNoZTo6ZHJh d1dpbmRvd0NvbnRlbnQpOgorICAgICAgICBXZSBkb24ndCBoYXZlIHRvIHJlc3RvcmUgZXhwbGlj aXRseSBhbnltb3JlLgorCiAyMDIwLTExLTA5ICBKdWxpYW4gR29uemFsZXogIDxqdWxpYW5fYV9n b256YWxlekBhcHBsZS5jb20+CiAKICAgICAgICAgTnVsbCBkZXJlZmVyZW5jZSBpbiBDb21wb3Np dGVFZGl0Q29tbWFuZDo6c3BsaXRUcmVlVG9Ob2RlKCkgZHVlIHRvIG5vdCBjaGVja2luZyBmb3Ig dG9wIG9mIERPTSB0cmVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL2NvY29hL1BsYXRmb3JtQ0FMYXllckNvY29hLm1tCmluZGV4IDI4 ODQ2ZjZiOTE1NjExYjkyZWY3NDBkOTNhOTgxZDAwMDNhNWI2OWMuLjI1MjU3NmJjNmEyYzEzN2Y4 MTVkNzA1M2ZkZWM4NGYyODIzYTdhZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhL2NvY29hL1BsYXRmb3JtQ0FMYXllckNvY29hLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL2NvY29hL1BsYXRmb3JtQ0FMYXllckNvY29h Lm1tCkBAIC0xMTU1LDY1ICsxMTU1LDUyIEBAIHZvaWQgUGxhdGZvcm1DQUxheWVyOjpkcmF3TGF5 ZXJDb250ZW50cyhHcmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCwgV2ViQ29yCiAgICAg aWYgKCFsYXllckNvbnRlbnRzLT5wbGF0Zm9ybUNBTGF5ZXJSZXBhaW50Q291bnQocGxhdGZvcm1D QUxheWVyKSkKICAgICAgICAgbGF5ZXJQYWludEJlaGF2aW9yIHw9IEdyYXBoaWNzTGF5ZXJQYWlu dEZpcnN0VGlsZVBhaW50OwogCi0gICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzYXZlcihn cmFwaGljc0NvbnRleHQpOwotCi0gICAgLy8gV2UgbmV2ZXIgdXNlIENvbXBvc2l0aW5nQ29vcmRp bmF0ZXNPcmllbnRhdGlvbjo6Qm90dG9tVXAgb24gTWFjLgotICAgIEFTU0VSVChsYXllckNvbnRl bnRzLT5wbGF0Zm9ybUNBTGF5ZXJDb250ZW50c09yaWVudGF0aW9uKCkgPT0gR3JhcGhpY3NMYXll cjo6Q29tcG9zaXRpbmdDb29yZGluYXRlc09yaWVudGF0aW9uOjpUb3BEb3duKTsKLQorICAgIHsK KyAgICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzYXZlcihncmFwaGljc0NvbnRleHQp OworICAgICAgICBXVEY6Ok9wdGlvbmFsPExvY2FsQ3VycmVudEdyYXBoaWNzQ29udGV4dD4gcGxh dGZvcm1Db250ZXh0U2F2ZXI7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAgICBXVEY6Ok9w dGlvbmFsPEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyPiBmb250QW50aWFsaWFzaW5nU3RhdGU7 CisgICAgICAgIFdURjo6T3B0aW9uYWw8Rm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXI+IGZvbnRB bnRpYWxpYXNpbmdTdGF0ZTsKICNlbmRpZgotICAgIGlmIChncmFwaGljc0NvbnRleHQuaGFzUGxh dGZvcm1Db250ZXh0KCkpIHsKLSAgICAgICAgQ0dDb250ZXh0UmVmIGNvbnRleHQgPSBncmFwaGlj c0NvbnRleHQucGxhdGZvcm1Db250ZXh0KCk7Ci0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKLSAg ICAgICAgV0tTZXRDdXJyZW50R3JhcGhpY3NDb250ZXh0KGNvbnRleHQpOwogCi0gICAgICAgIGZv bnRBbnRpYWxpYXNpbmdTdGF0ZSA9IEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyIHsgY29udGV4 dCwgISFbcGxhdGZvcm1DQUxheWVyLT5wbGF0Zm9ybUxheWVyKCkgaXNPcGFxdWVdIH07Ci0gICAg ICAgIGZvbnRBbnRpYWxpYXNpbmdTdGF0ZS0+c2V0dXAoW1dBS1dpbmRvdyBoYXNMYW5kc2NhcGVP cmllbnRhdGlvbl0pOwotI2Vsc2UKLSAgICAgICAgW05TR3JhcGhpY3NDb250ZXh0IHNhdmVHcmFw aGljc1N0YXRlXTsKKyAgICAgICAgLy8gV2UgbmV2ZXIgdXNlIENvbXBvc2l0aW5nQ29vcmRpbmF0 ZXNPcmllbnRhdGlvbjo6Qm90dG9tVXAgb24gTWFjLgorICAgICAgICBBU1NFUlQobGF5ZXJDb250 ZW50cy0+cGxhdGZvcm1DQUxheWVyQ29udGVudHNPcmllbnRhdGlvbigpID09IEdyYXBoaWNzTGF5 ZXI6OkNvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbjo6VG9wRG93bik7CiAKLSAgICAg ICAgLy8gU2V0IHVwIGFuIE5TR3JhcGhpY3NDb250ZXh0IGZvciB0aGUgY29udGV4dCwgc28gdGhh dCBwYXJ0cyBvZiBBcHBLaXQgdGhhdCByZWx5IG9uCi0gICAgICAgIC8vIHRoZSBjdXJyZW50IE5T R3JhcGhpY3NDb250ZXh0IChlLmcuIE5TQ2VsbCBkcmF3aW5nKSBnZXQgdGhlIHJpZ2h0IG9uZS4K LSAgICAgICAgTlNHcmFwaGljc0NvbnRleHQqIGxheWVyQ29udGV4dCA9IFtOU0dyYXBoaWNzQ29u dGV4dCBncmFwaGljc0NvbnRleHRXaXRoQ0dDb250ZXh0OmNvbnRleHQgZmxpcHBlZDpZRVNdOwot ICAgICAgICBbTlNHcmFwaGljc0NvbnRleHQgc2V0Q3VycmVudENvbnRleHQ6bGF5ZXJDb250ZXh0 XTsKKyAgICAgICAgaWYgKGdyYXBoaWNzQ29udGV4dC5oYXNQbGF0Zm9ybUNvbnRleHQoKSkgewor ICAgICAgICAgICAgcGxhdGZvcm1Db250ZXh0U2F2ZXIgPSBMb2NhbEN1cnJlbnRHcmFwaGljc0Nv bnRleHQgeyBncmFwaGljc0NvbnRleHQgfTsKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAg ICAgICAgICAgZm9udEFudGlhbGlhc2luZ1N0YXRlID0gRm9udEFudGlhbGlhc2luZ1N0YXRlU2F2 ZXIgeyBjb250ZXh0LCAhIVtwbGF0Zm9ybUNBTGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSBpc09wYXF1 ZV0gfTsKKyAgICAgICAgICAgIGZvbnRBbnRpYWxpYXNpbmdTdGF0ZS0+c2V0dXAoW1dBS1dpbmRv dyBoYXNMYW5kc2NhcGVPcmllbnRhdGlvbl0pOwogI2VuZGlmCi0gICAgfQotICAgIAotICAgIHsK LSAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldElzQ0FMYXllckNvbnRleHQodHJ1ZSk7Ci0gICAg ICAgIGdyYXBoaWNzQ29udGV4dC5zZXRJc0FjY2VsZXJhdGVkQ29udGV4dChwbGF0Zm9ybUNBTGF5 ZXItPmFjY2VsZXJhdGVzRHJhd2luZygpKTsKLQotICAgICAgICBpZiAoIWxheWVyQ29udGVudHMt PnBsYXRmb3JtQ0FMYXllckNvbnRlbnRzT3BhcXVlKCkgJiYgIXBsYXRmb3JtQ0FMYXllci0+c3Vw cG9ydHNTdWJwaXhlbEFudGlhbGlhc2VkVGV4dCgpICYmIEZvbnRDYXNjYWRlOjppc1N1YnBpeGVs QW50aWFsaWFzaW5nQXZhaWxhYmxlKCkpIHsKLSAgICAgICAgICAgIC8vIFR1cm4gb2ZmIGZvbnQg c21vb3RoaW5nIHRvIGltcHJvdmUgdGhlIGFwcGVhcmFuY2Ugb2YgdGV4dCByZW5kZXJlZCBvbnRv IGEgdHJhbnNwYXJlbnQgYmFja2dyb3VuZC4KLSAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5z ZXRTaG91bGRTbW9vdGhGb250cyhmYWxzZSk7CiAgICAgICAgIH0KKyAgICAgICAgCisgICAgICAg IHsKKyAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRJc0NBTGF5ZXJDb250ZXh0KHRydWUp OworICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldElzQWNjZWxlcmF0ZWRDb250ZXh0KHBs YXRmb3JtQ0FMYXllci0+YWNjZWxlcmF0ZXNEcmF3aW5nKCkpOworCisgICAgICAgICAgICBpZiAo IWxheWVyQ29udGVudHMtPnBsYXRmb3JtQ0FMYXllckNvbnRlbnRzT3BhcXVlKCkgJiYgIXBsYXRm b3JtQ0FMYXllci0+c3VwcG9ydHNTdWJwaXhlbEFudGlhbGlhc2VkVGV4dCgpICYmIEZvbnRDYXNj YWRlOjppc1N1YnBpeGVsQW50aWFsaWFzaW5nQXZhaWxhYmxlKCkpIHsKKyAgICAgICAgICAgICAg ICAvLyBUdXJuIG9mZiBmb250IHNtb290aGluZyB0byBpbXByb3ZlIHRoZSBhcHBlYXJhbmNlIG9m IHRleHQgcmVuZGVyZWQgb250byBhIHRyYW5zcGFyZW50IGJhY2tncm91bmQuCisgICAgICAgICAg ICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldFNob3VsZFNtb290aEZvbnRzKGZhbHNlKTsKKyAgICAg ICAgICAgIH0KIAogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgLy8gSXQncyBpbXBvcnRhbnQg dG8gZ2V0IHRoZSBjbGlwIGZyb20gdGhlIGNvbnRleHQsIGJlY2F1c2UgaXQgbWF5IGJlIHNpZ25p ZmljYW50bHkKLSAgICAgICAgLy8gc21hbGxlciB0aGFuIHRoZSBsYXllciBib3VuZHMgKGUuZy4g dGlsZWQgbGF5ZXJzKQotICAgICAgICBUaGVtZU1hYzo6c2V0Rm9jdXNSaW5nQ2xpcFJlY3QoZ3Jh cGhpY3NDb250ZXh0LmNsaXBCb3VuZHMoKSk7CisgICAgICAgICAgICAvLyBJdCdzIGltcG9ydGFu dCB0byBnZXQgdGhlIGNsaXAgZnJvbSB0aGUgY29udGV4dCwgYmVjYXVzZSBpdCBtYXkgYmUgc2ln bmlmaWNhbnRseQorICAgICAgICAgICAgLy8gc21hbGxlciB0aGFuIHRoZSBsYXllciBib3VuZHMg KGUuZy4gdGlsZWQgbGF5ZXJzKQorICAgICAgICAgICAgVGhlbWVNYWM6OnNldEZvY3VzUmluZ0Ns aXBSZWN0KGdyYXBoaWNzQ29udGV4dC5jbGlwQm91bmRzKCkpOwogI2VuZGlmCiAKLSAgICAgICAg Zm9yIChjb25zdCBhdXRvJiByZWN0IDogZGlydHlSZWN0cykgewotICAgICAgICAgICAgR3JhcGhp Y3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGdyYXBoaWNzQ29udGV4dCk7Ci0gICAgICAg ICAgICBncmFwaGljc0NvbnRleHQuY2xpcChyZWN0KTsKKyAgICAgICAgICAgIGZvciAoY29uc3Qg YXV0byYgcmVjdCA6IGRpcnR5UmVjdHMpIHsKKyAgICAgICAgICAgICAgICBHcmFwaGljc0NvbnRl eHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsKKyAgICAgICAgICAgICAg ICBncmFwaGljc0NvbnRleHQuY2xpcChyZWN0KTsKIAotICAgICAgICAgICAgbGF5ZXJDb250ZW50 cy0+cGxhdGZvcm1DQUxheWVyUGFpbnRDb250ZW50cyhwbGF0Zm9ybUNBTGF5ZXIsIGdyYXBoaWNz Q29udGV4dCwgcmVjdCwgbGF5ZXJQYWludEJlaGF2aW9yKTsKLSAgICAgICAgfQorICAgICAgICAg ICAgICAgIGxheWVyQ29udGVudHMtPnBsYXRmb3JtQ0FMYXllclBhaW50Q29udGVudHMocGxhdGZv cm1DQUxheWVyLCBncmFwaGljc0NvbnRleHQsIHJlY3QsIGxheWVyUGFpbnRCZWhhdmlvcik7Cisg ICAgICAgICAgICB9CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgICAgICBpZiAoZm9u dEFudGlhbGlhc2luZ1N0YXRlKQotICAgICAgICAgICAgZm9udEFudGlhbGlhc2luZ1N0YXRlLT5y ZXN0b3JlKCk7Ci0jZWxzZQotICAgICAgICBUaGVtZU1hYzo6c2V0Rm9jdXNSaW5nQ2xpcFJlY3Qo RmxvYXRSZWN0KCkpOwotCi0gICAgICAgIFtOU0dyYXBoaWNzQ29udGV4dCByZXN0b3JlR3JhcGhp Y3NTdGF0ZV07CisjaWYgUExBVEZPUk0oTUFDKQorICAgICAgICAgICAgVGhlbWVNYWM6OnNldEZv Y3VzUmluZ0NsaXBSZWN0KEZsb2F0UmVjdCgpKTsKICNlbmRpZgorICAgICAgICB9CiAgICAgfQog Ci0gICAgc2F2ZXIucmVzdG9yZSgpOwotCiAgICAgLy8gUmUtZmV0Y2ggdGhlIGxheWVyIG93bmVy LCBzaW5jZSA8cmRhcjovL3Byb2JsZW0vOTEyNTE1MT4gaW5kaWNhdGVzIHRoYXQgaXQgbWlnaHQg aGF2ZSBiZWVuIGRlc3Ryb3llZCBkdXJpbmcgcGFpbnRpbmcuCiAgICAgbGF5ZXJDb250ZW50cyA9 IHBsYXRmb3JtQ0FMYXllci0+b3duZXIoKTsKICAgICBBU1NFUlQobGF5ZXJDb250ZW50cyk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9udEFudGlh bGlhc2luZ1N0YXRlU2F2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lv cy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oCmluZGV4IGY3MGFmMjllZGZlMmJiNjA2ZmE0 OGNmZDU4YjJhZDc5ZDZlODYzMDAuLjNhYzZhNGIxYjVhZmJjN2U5NTAxMjUzMzE5YzQyMWYyODFl Y2U3ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9G b250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oCkBAIC00Niw2ICs0Niwx NCBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICB9CiAKKyAgICB+Rm9udEFudGlhbGlhc2luZ1N0YXRl U2F2ZXIoKQorICAgIHsKKyNpZiAhUExBVEZPUk0oSU9TX0ZBTUlMWV9TSU1VTEFUT1IpCisgICAg ICAgIGlmIChtX3VzZU9yaWVudGF0aW9uRGVwZW5kZW50Rm9udEFudGlhbGlhc2luZykKKyAgICAg ICAgICAgIENHQ29udGV4dFNldEZvbnRBbnRpYWxpYXNpbmdTdHlsZShtX2NvbnRleHQsIG1fb2xk QW50aWFsaWFzaW5nU3R5bGUpOworI2VuZGlmCisgICAgfQorCiAgICAgdm9pZCBzZXR1cChib29s IGlzTGFuZHNjYXBlT3JpZW50YXRpb24pCiAgICAgewogI2lmICFQTEFURk9STShJT1NfRkFNSUxZ X1NJTVVMQVRPUikKQEAgLTU4LDE0ICs2Niw2IEBAIHB1YmxpYzoKICNlbmRpZgogICAgIH0KIAot ICAgIHZvaWQgcmVzdG9yZSgpCi0gICAgewotI2lmICFQTEFURk9STShJT1NfRkFNSUxZX1NJTVVM QVRPUikKLSAgICAgICAgaWYgKG1fdXNlT3JpZW50YXRpb25EZXBlbmRlbnRGb250QW50aWFsaWFz aW5nKQotICAgICAgICAgICAgQ0dDb250ZXh0U2V0Rm9udEFudGlhbGlhc2luZ1N0eWxlKG1fY29u dGV4dCwgbV9vbGRBbnRpYWxpYXNpbmdTdHlsZSk7Ci0jZW5kaWYKLSAgICB9Ci0KIHByaXZhdGU6 CiAjaWYgIVBMQVRGT1JNKElPU19GQU1JTFlfU0lNVUxBVE9SKQogICAgIENHQ29udGV4dFJlZiBt X2NvbnRleHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvTGVnYWN5 VGlsZUNhY2hlLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0xlZ2FjeVRpbGVDYWNo ZS5tbQppbmRleCA1Mzc0MDg2OTBkY2NhMTY5ZWRlOTI1NmM5N2M4MjBlMGQ5ZGYxMmUwLi41MTU1 MjIyNWU2NGIxMjAyMmQzNzU4NDY4YzY3OWVmMDlhZWE1ZmJkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3MvTGVnYWN5VGlsZUNhY2hlLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9MZWdhY3lUaWxlQ2FjaGUubW0KQEAgLTUzNyw4ICs1MzcsNiBAQCB2 b2lkIExlZ2FjeVRpbGVDYWNoZTo6ZHJhd1dpbmRvd0NvbnRlbnQoTGVnYWN5VGlsZUxheWVyKiBs YXllciwgQ0dDb250ZXh0UmVmIGNvbgogICAgICAgICBDR1JlY3QgZGlydHlSZWN0SW5TdXBlciA9 IFtob3N0TGF5ZXIoKSBjb252ZXJ0UmVjdDpkaXJ0eVJlY3QgZnJvbUxheWVyOmxheWVyXTsKICAg ICAgICAgW21fd2luZG93IGRpc3BsYXlSZWN0OmRpcnR5UmVjdEluU3VwZXJdOwogICAgIH0KLQot ICAgIGZvbnRBbnRpYWxpYXNpbmdTdGF0ZS5yZXN0b3JlKCk7CiAgICAgCiAgICAgaWYgKGRyYXdp bmdGbGFncyA9PSBEcmF3aW5nRmxhZ3M6OlNuYXBzaG90dGluZykKICAgICAgICAgW21fd2luZG93 IHNldElzSW5TbmFwc2hvdHRpbmdQYWludDpOT107Cg== 413647 2020-11-09 16:54:51 -0800 2020-11-09 17:08:34 -0800 Patch bug-218731-20201109165450.patch text/plain 9049 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEwOTQ2YThhNGEwZDkw ZjJkNzRjZTAwOWYxNmMxNTMzZjI3ZjJiNC4uMmQ1M2E1ZjU2NmExODY4MTIzZTIzYzNhODY4MmJl N2FjNmJlNjFlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEV4Y2VwdGlvbnMg dW5kZXIgUGxhdGZvcm1DQUxheWVyQ29jb2E6OmRyYXdMYXllckNvbnRlbnRzIHdpdGggRGlzcGxh eUxpc3QtYmFja2VkIGxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTm8gbmV3IHRlc3RzOyBhbGwgdGVzdHMgd2lsbCBjb3ZlciB0aGlzIG9uY2Ug R1BVIFByb2Nlc3MgZm9yIERPTSByZW5kZXJpbmcgbGFuZHMuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbToKKyAgICAgICAgKFdl YkNvcmU6OlBsYXRmb3JtQ0FMYXllcjo6ZHJhd0xheWVyQ29udGVudHMpOgorICAgICAgICBSZWZh Y3RvciB0aGlzIGZ1bmN0aW9uIHRvIHVzZSB0aHJlZSBzdGF0ZSBzYXZlcnMsIGFsbCByZWxlYXNl ZCBieSBzY29wZSBpbnN0ZWFkIG9mIGV4cGxpY2l0bHkuCisgICAgICAgIFRoaXMgZml4ZXMgdGhl IGJ1ZyBpbiB0aGUgdGl0bGUsIHdoaWNoIHdhcyB0aGF0IHdlIHdvdWxkIGNhbGwgK3Jlc3RvcmVH cmFwaGljc1N0YXRlIG9uIE5TR3JhcGhpY3NDb250ZXh0CisgICAgICAgIHJlZ2FyZGxlc3Mgb2Yg d2hldGhlciB3ZSBoYXZlIGEgcGxhdGZvcm0gY29udGV4dCBvciBub3QgKHdoaWxlIHdlJ2Qgb25s eSBzYXZlIGlmIHdlIC9kaWQvIGhhdmUgb25lKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oOgorICAgICAgICAoV2ViQ29yZTo6 Rm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXI6On5Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlcik6 CisgICAgICAgIChXZWJDb3JlOjpGb250QW50aWFsaWFzaW5nU3RhdGVTYXZlcjo6cmVzdG9yZSk6 IERlbGV0ZWQuCisgICAgICAgIE1ha2UgRm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIgYmVoYXZl IGxpa2UgYWxsIG9mIHRoZSBvdGhlciAtU3RhdGVTYXZlcnMsIHBlcmZvcm1pbmcgInJlc3RvcmUi CisgICAgICAgIGluIGl0cyBkZXN0cnVjdG9yLgorCisgICAgICAgICogcGxhdGZvcm0vaW9zL0xl Z2FjeVRpbGVDYWNoZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVRpbGVDYWNoZTo6ZHJh d1dpbmRvd0NvbnRlbnQpOgorICAgICAgICBXZSBkb24ndCBoYXZlIHRvIHJlc3RvcmUgZXhwbGlj aXRseSBhbnltb3JlLgorCiAyMDIwLTExLTA5ICBKdWxpYW4gR29uemFsZXogIDxqdWxpYW5fYV9n b256YWxlekBhcHBsZS5jb20+CiAKICAgICAgICAgTnVsbCBkZXJlZmVyZW5jZSBpbiBDb21wb3Np dGVFZGl0Q29tbWFuZDo6c3BsaXRUcmVlVG9Ob2RlKCkgZHVlIHRvIG5vdCBjaGVja2luZyBmb3Ig dG9wIG9mIERPTSB0cmVlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL2NvY29hL1BsYXRmb3JtQ0FMYXllckNvY29hLm1tCmluZGV4IDI4 ODQ2ZjZiOTE1NjExYjkyZWY3NDBkOTNhOTgxZDAwMDNhNWI2OWMuLjVmOTQ1Yjc3ZjljYTI2MmM0 YTBiMjRjYTlmOTI2M2FjMmEwZjExODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NhL2NvY29hL1BsYXRmb3JtQ0FMYXllckNvY29hLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL2NvY29hL1BsYXRmb3JtQ0FMYXllckNvY29h Lm1tCkBAIC0zMSw2ICszMSw3IEBACiAjaW1wb3J0ICJHcmFwaGljc0xheWVyQ0EuaCIKICNpbXBv cnQgIklPU3VyZmFjZS5oIgogI2ltcG9ydCAiTGVuZ3RoRnVuY3Rpb25zLmgiCisjaW1wb3J0ICJM b2NhbEN1cnJlbnRHcmFwaGljc0NvbnRleHQuaCIKICNpbXBvcnQgIlBsYXRmb3JtQ0FBbmltYXRp b25Db2NvYS5oIgogI2ltcG9ydCAiUGxhdGZvcm1DQUZpbHRlcnMuaCIKICNpbXBvcnQgIlNjcm9s bGJhclRoZW1lTWFjLmgiCkBAIC0xMTU1LDY1ICsxMTU2LDUyIEBAIHZvaWQgUGxhdGZvcm1DQUxh eWVyOjpkcmF3TGF5ZXJDb250ZW50cyhHcmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCwg V2ViQ29yCiAgICAgaWYgKCFsYXllckNvbnRlbnRzLT5wbGF0Zm9ybUNBTGF5ZXJSZXBhaW50Q291 bnQocGxhdGZvcm1DQUxheWVyKSkKICAgICAgICAgbGF5ZXJQYWludEJlaGF2aW9yIHw9IEdyYXBo aWNzTGF5ZXJQYWludEZpcnN0VGlsZVBhaW50OwogCi0gICAgR3JhcGhpY3NDb250ZXh0U3RhdGVT YXZlciBzYXZlcihncmFwaGljc0NvbnRleHQpOwotCi0gICAgLy8gV2UgbmV2ZXIgdXNlIENvbXBv c2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbjo6Qm90dG9tVXAgb24gTWFjLgotICAgIEFTU0VS VChsYXllckNvbnRlbnRzLT5wbGF0Zm9ybUNBTGF5ZXJDb250ZW50c09yaWVudGF0aW9uKCkgPT0g R3JhcGhpY3NMYXllcjo6Q29tcG9zaXRpbmdDb29yZGluYXRlc09yaWVudGF0aW9uOjpUb3BEb3du KTsKLQorICAgIHsKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzYXZlcihncmFw aGljc0NvbnRleHQpOworICAgICAgICBXVEY6Ok9wdGlvbmFsPExvY2FsQ3VycmVudEdyYXBoaWNz Q29udGV4dD4gcGxhdGZvcm1Db250ZXh0U2F2ZXI7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkK LSAgICBXVEY6Ok9wdGlvbmFsPEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyPiBmb250QW50aWFs aWFzaW5nU3RhdGU7CisgICAgICAgIFdURjo6T3B0aW9uYWw8Rm9udEFudGlhbGlhc2luZ1N0YXRl U2F2ZXI+IGZvbnRBbnRpYWxpYXNpbmdTdGF0ZTsKICNlbmRpZgotICAgIGlmIChncmFwaGljc0Nv bnRleHQuaGFzUGxhdGZvcm1Db250ZXh0KCkpIHsKLSAgICAgICAgQ0dDb250ZXh0UmVmIGNvbnRl eHQgPSBncmFwaGljc0NvbnRleHQucGxhdGZvcm1Db250ZXh0KCk7Ci0jaWYgUExBVEZPUk0oSU9T X0ZBTUlMWSkKLSAgICAgICAgV0tTZXRDdXJyZW50R3JhcGhpY3NDb250ZXh0KGNvbnRleHQpOwog Ci0gICAgICAgIGZvbnRBbnRpYWxpYXNpbmdTdGF0ZSA9IEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNh dmVyIHsgY29udGV4dCwgISFbcGxhdGZvcm1DQUxheWVyLT5wbGF0Zm9ybUxheWVyKCkgaXNPcGFx dWVdIH07Ci0gICAgICAgIGZvbnRBbnRpYWxpYXNpbmdTdGF0ZS0+c2V0dXAoW1dBS1dpbmRvdyBo YXNMYW5kc2NhcGVPcmllbnRhdGlvbl0pOwotI2Vsc2UKLSAgICAgICAgW05TR3JhcGhpY3NDb250 ZXh0IHNhdmVHcmFwaGljc1N0YXRlXTsKKyAgICAgICAgLy8gV2UgbmV2ZXIgdXNlIENvbXBvc2l0 aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbjo6Qm90dG9tVXAgb24gTWFjLgorICAgICAgICBBU1NF UlQobGF5ZXJDb250ZW50cy0+cGxhdGZvcm1DQUxheWVyQ29udGVudHNPcmllbnRhdGlvbigpID09 IEdyYXBoaWNzTGF5ZXI6OkNvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbjo6VG9wRG93 bik7CiAKLSAgICAgICAgLy8gU2V0IHVwIGFuIE5TR3JhcGhpY3NDb250ZXh0IGZvciB0aGUgY29u dGV4dCwgc28gdGhhdCBwYXJ0cyBvZiBBcHBLaXQgdGhhdCByZWx5IG9uCi0gICAgICAgIC8vIHRo ZSBjdXJyZW50IE5TR3JhcGhpY3NDb250ZXh0IChlLmcuIE5TQ2VsbCBkcmF3aW5nKSBnZXQgdGhl IHJpZ2h0IG9uZS4KLSAgICAgICAgTlNHcmFwaGljc0NvbnRleHQqIGxheWVyQ29udGV4dCA9IFtO U0dyYXBoaWNzQ29udGV4dCBncmFwaGljc0NvbnRleHRXaXRoQ0dDb250ZXh0OmNvbnRleHQgZmxp cHBlZDpZRVNdOwotICAgICAgICBbTlNHcmFwaGljc0NvbnRleHQgc2V0Q3VycmVudENvbnRleHQ6 bGF5ZXJDb250ZXh0XTsKKyAgICAgICAgaWYgKGdyYXBoaWNzQ29udGV4dC5oYXNQbGF0Zm9ybUNv bnRleHQoKSkgeworICAgICAgICAgICAgcGxhdGZvcm1Db250ZXh0U2F2ZXIgPSBMb2NhbEN1cnJl bnRHcmFwaGljc0NvbnRleHQgeyBncmFwaGljc0NvbnRleHQgfTsKKyNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQorICAgICAgICAgICAgZm9udEFudGlhbGlhc2luZ1N0YXRlID0gRm9udEFudGlhbGlh c2luZ1N0YXRlU2F2ZXIgeyBjb250ZXh0LCAhIVtwbGF0Zm9ybUNBTGF5ZXItPnBsYXRmb3JtTGF5 ZXIoKSBpc09wYXF1ZV0gfTsKKyAgICAgICAgICAgIGZvbnRBbnRpYWxpYXNpbmdTdGF0ZS0+c2V0 dXAoW1dBS1dpbmRvdyBoYXNMYW5kc2NhcGVPcmllbnRhdGlvbl0pOwogI2VuZGlmCi0gICAgfQot ICAgIAotICAgIHsKLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldElzQ0FMYXllckNvbnRleHQo dHJ1ZSk7Ci0gICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRJc0FjY2VsZXJhdGVkQ29udGV4dChw bGF0Zm9ybUNBTGF5ZXItPmFjY2VsZXJhdGVzRHJhd2luZygpKTsKLQotICAgICAgICBpZiAoIWxh eWVyQ29udGVudHMtPnBsYXRmb3JtQ0FMYXllckNvbnRlbnRzT3BhcXVlKCkgJiYgIXBsYXRmb3Jt Q0FMYXllci0+c3VwcG9ydHNTdWJwaXhlbEFudGlhbGlhc2VkVGV4dCgpICYmIEZvbnRDYXNjYWRl Ojppc1N1YnBpeGVsQW50aWFsaWFzaW5nQXZhaWxhYmxlKCkpIHsKLSAgICAgICAgICAgIC8vIFR1 cm4gb2ZmIGZvbnQgc21vb3RoaW5nIHRvIGltcHJvdmUgdGhlIGFwcGVhcmFuY2Ugb2YgdGV4dCBy ZW5kZXJlZCBvbnRvIGEgdHJhbnNwYXJlbnQgYmFja2dyb3VuZC4KLSAgICAgICAgICAgIGdyYXBo aWNzQ29udGV4dC5zZXRTaG91bGRTbW9vdGhGb250cyhmYWxzZSk7CiAgICAgICAgIH0KKyAgICAg ICAgCisgICAgICAgIHsKKyAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRJc0NBTGF5ZXJD b250ZXh0KHRydWUpOworICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldElzQWNjZWxlcmF0 ZWRDb250ZXh0KHBsYXRmb3JtQ0FMYXllci0+YWNjZWxlcmF0ZXNEcmF3aW5nKCkpOworCisgICAg ICAgICAgICBpZiAoIWxheWVyQ29udGVudHMtPnBsYXRmb3JtQ0FMYXllckNvbnRlbnRzT3BhcXVl KCkgJiYgIXBsYXRmb3JtQ0FMYXllci0+c3VwcG9ydHNTdWJwaXhlbEFudGlhbGlhc2VkVGV4dCgp ICYmIEZvbnRDYXNjYWRlOjppc1N1YnBpeGVsQW50aWFsaWFzaW5nQXZhaWxhYmxlKCkpIHsKKyAg ICAgICAgICAgICAgICAvLyBUdXJuIG9mZiBmb250IHNtb290aGluZyB0byBpbXByb3ZlIHRoZSBh cHBlYXJhbmNlIG9mIHRleHQgcmVuZGVyZWQgb250byBhIHRyYW5zcGFyZW50IGJhY2tncm91bmQu CisgICAgICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldFNob3VsZFNtb290aEZvbnRzKGZh bHNlKTsKKyAgICAgICAgICAgIH0KIAogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgLy8gSXQn cyBpbXBvcnRhbnQgdG8gZ2V0IHRoZSBjbGlwIGZyb20gdGhlIGNvbnRleHQsIGJlY2F1c2UgaXQg bWF5IGJlIHNpZ25pZmljYW50bHkKLSAgICAgICAgLy8gc21hbGxlciB0aGFuIHRoZSBsYXllciBi b3VuZHMgKGUuZy4gdGlsZWQgbGF5ZXJzKQotICAgICAgICBUaGVtZU1hYzo6c2V0Rm9jdXNSaW5n Q2xpcFJlY3QoZ3JhcGhpY3NDb250ZXh0LmNsaXBCb3VuZHMoKSk7CisgICAgICAgICAgICAvLyBJ dCdzIGltcG9ydGFudCB0byBnZXQgdGhlIGNsaXAgZnJvbSB0aGUgY29udGV4dCwgYmVjYXVzZSBp dCBtYXkgYmUgc2lnbmlmaWNhbnRseQorICAgICAgICAgICAgLy8gc21hbGxlciB0aGFuIHRoZSBs YXllciBib3VuZHMgKGUuZy4gdGlsZWQgbGF5ZXJzKQorICAgICAgICAgICAgVGhlbWVNYWM6OnNl dEZvY3VzUmluZ0NsaXBSZWN0KGdyYXBoaWNzQ29udGV4dC5jbGlwQm91bmRzKCkpOwogI2VuZGlm CiAKLSAgICAgICAgZm9yIChjb25zdCBhdXRvJiByZWN0IDogZGlydHlSZWN0cykgewotICAgICAg ICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGdyYXBoaWNzQ29udGV4 dCk7Ci0gICAgICAgICAgICBncmFwaGljc0NvbnRleHQuY2xpcChyZWN0KTsKKyAgICAgICAgICAg IGZvciAoY29uc3QgYXV0byYgcmVjdCA6IGRpcnR5UmVjdHMpIHsKKyAgICAgICAgICAgICAgICBH cmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsKKyAg ICAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQuY2xpcChyZWN0KTsKIAotICAgICAgICAgICAg bGF5ZXJDb250ZW50cy0+cGxhdGZvcm1DQUxheWVyUGFpbnRDb250ZW50cyhwbGF0Zm9ybUNBTGF5 ZXIsIGdyYXBoaWNzQ29udGV4dCwgcmVjdCwgbGF5ZXJQYWludEJlaGF2aW9yKTsKLSAgICAgICAg fQorICAgICAgICAgICAgICAgIGxheWVyQ29udGVudHMtPnBsYXRmb3JtQ0FMYXllclBhaW50Q29u dGVudHMocGxhdGZvcm1DQUxheWVyLCBncmFwaGljc0NvbnRleHQsIHJlY3QsIGxheWVyUGFpbnRC ZWhhdmlvcik7CisgICAgICAgICAgICB9CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAg ICAgICBpZiAoZm9udEFudGlhbGlhc2luZ1N0YXRlKQotICAgICAgICAgICAgZm9udEFudGlhbGlh c2luZ1N0YXRlLT5yZXN0b3JlKCk7Ci0jZWxzZQotICAgICAgICBUaGVtZU1hYzo6c2V0Rm9jdXNS aW5nQ2xpcFJlY3QoRmxvYXRSZWN0KCkpOwotCi0gICAgICAgIFtOU0dyYXBoaWNzQ29udGV4dCBy ZXN0b3JlR3JhcGhpY3NTdGF0ZV07CisjaWYgUExBVEZPUk0oTUFDKQorICAgICAgICAgICAgVGhl bWVNYWM6OnNldEZvY3VzUmluZ0NsaXBSZWN0KEZsb2F0UmVjdCgpKTsKICNlbmRpZgorICAgICAg ICB9CiAgICAgfQogCi0gICAgc2F2ZXIucmVzdG9yZSgpOwotCiAgICAgLy8gUmUtZmV0Y2ggdGhl IGxheWVyIG93bmVyLCBzaW5jZSA8cmRhcjovL3Byb2JsZW0vOTEyNTE1MT4gaW5kaWNhdGVzIHRo YXQgaXQgbWlnaHQgaGF2ZSBiZWVuIGRlc3Ryb3llZCBkdXJpbmcgcGFpbnRpbmcuCiAgICAgbGF5 ZXJDb250ZW50cyA9IHBsYXRmb3JtQ0FMYXllci0+b3duZXIoKTsKICAgICBBU1NFUlQobGF5ZXJD b250ZW50cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9p b3MvRm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oCmluZGV4IGY3MGFmMjll ZGZlMmJiNjA2ZmE0OGNmZDU4YjJhZDc5ZDZlODYzMDAuLjNhYzZhNGIxYjVhZmJjN2U5NTAxMjUz MzE5YzQyMWYyODFlY2U3ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oCkBA IC00Niw2ICs0NiwxNCBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICB9CiAKKyAgICB+Rm9udEFudGlh bGlhc2luZ1N0YXRlU2F2ZXIoKQorICAgIHsKKyNpZiAhUExBVEZPUk0oSU9TX0ZBTUlMWV9TSU1V TEFUT1IpCisgICAgICAgIGlmIChtX3VzZU9yaWVudGF0aW9uRGVwZW5kZW50Rm9udEFudGlhbGlh c2luZykKKyAgICAgICAgICAgIENHQ29udGV4dFNldEZvbnRBbnRpYWxpYXNpbmdTdHlsZShtX2Nv bnRleHQsIG1fb2xkQW50aWFsaWFzaW5nU3R5bGUpOworI2VuZGlmCisgICAgfQorCiAgICAgdm9p ZCBzZXR1cChib29sIGlzTGFuZHNjYXBlT3JpZW50YXRpb24pCiAgICAgewogI2lmICFQTEFURk9S TShJT1NfRkFNSUxZX1NJTVVMQVRPUikKQEAgLTU4LDE0ICs2Niw2IEBAIHB1YmxpYzoKICNlbmRp ZgogICAgIH0KIAotICAgIHZvaWQgcmVzdG9yZSgpCi0gICAgewotI2lmICFQTEFURk9STShJT1Nf RkFNSUxZX1NJTVVMQVRPUikKLSAgICAgICAgaWYgKG1fdXNlT3JpZW50YXRpb25EZXBlbmRlbnRG b250QW50aWFsaWFzaW5nKQotICAgICAgICAgICAgQ0dDb250ZXh0U2V0Rm9udEFudGlhbGlhc2lu Z1N0eWxlKG1fY29udGV4dCwgbV9vbGRBbnRpYWxpYXNpbmdTdHlsZSk7Ci0jZW5kaWYKLSAgICB9 Ci0KIHByaXZhdGU6CiAjaWYgIVBMQVRGT1JNKElPU19GQU1JTFlfU0lNVUxBVE9SKQogICAgIENH Q29udGV4dFJlZiBtX2NvbnRleHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pb3MvTGVnYWN5VGlsZUNhY2hlLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0xl Z2FjeVRpbGVDYWNoZS5tbQppbmRleCA1Mzc0MDg2OTBkY2NhMTY5ZWRlOTI1NmM5N2M4MjBlMGQ5 ZGYxMmUwLi41MTU1MjIyNWU2NGIxMjAyMmQzNzU4NDY4YzY3OWVmMDlhZWE1ZmJkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvTGVnYWN5VGlsZUNhY2hlLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9MZWdhY3lUaWxlQ2FjaGUubW0KQEAgLTUzNyw4 ICs1MzcsNiBAQCB2b2lkIExlZ2FjeVRpbGVDYWNoZTo6ZHJhd1dpbmRvd0NvbnRlbnQoTGVnYWN5 VGlsZUxheWVyKiBsYXllciwgQ0dDb250ZXh0UmVmIGNvbgogICAgICAgICBDR1JlY3QgZGlydHlS ZWN0SW5TdXBlciA9IFtob3N0TGF5ZXIoKSBjb252ZXJ0UmVjdDpkaXJ0eVJlY3QgZnJvbUxheWVy OmxheWVyXTsKICAgICAgICAgW21fd2luZG93IGRpc3BsYXlSZWN0OmRpcnR5UmVjdEluU3VwZXJd OwogICAgIH0KLQotICAgIGZvbnRBbnRpYWxpYXNpbmdTdGF0ZS5yZXN0b3JlKCk7CiAgICAgCiAg ICAgaWYgKGRyYXdpbmdGbGFncyA9PSBEcmF3aW5nRmxhZ3M6OlNuYXBzaG90dGluZykKICAgICAg ICAgW21fd2luZG93IHNldElzSW5TbmFwc2hvdHRpbmdQYWludDpOT107Cg== 413649 2020-11-09 17:48:38 -0800 2020-11-09 18:22:27 -0800 Patch bug-218731-20201109174836.patch text/plain 9207 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y3N2I2MDEwZmU4ZWIz NWMxOWE3NDI5OTBhODkzMTYxOTJmOTUyYy4uZTcxMWQzZTZhYWQ0MjNhZDM2MTI3MzJlYzI0Yzk0 NDcyZDA4NDg1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEV4Y2VwdGlvbnMg dW5kZXIgUGxhdGZvcm1DQUxheWVyQ29jb2E6OmRyYXdMYXllckNvbnRlbnRzIHdpdGggRGlzcGxh eUxpc3QtYmFja2VkIGxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgor CisgICAgICAgIE5vIG5ldyB0ZXN0czsgYWxsIHRlc3RzIHdpbGwgY292ZXIgdGhpcyBvbmNlIEdQ VSBQcm9jZXNzIGZvciBET00gcmVuZGVyaW5nIGxhbmRzLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW06CisgICAgICAgIChXZWJD b3JlOjpQbGF0Zm9ybUNBTGF5ZXI6OmRyYXdMYXllckNvbnRlbnRzKToKKyAgICAgICAgUmVmYWN0 b3IgdGhpcyBmdW5jdGlvbiB0byB1c2UgdGhyZWUgc3RhdGUgc2F2ZXJzLCBhbGwgcmVsZWFzZWQg Ynkgc2NvcGUgaW5zdGVhZCBvZiBleHBsaWNpdGx5LgorICAgICAgICBUaGlzIGZpeGVzIHRoZSBi dWcgaW4gdGhlIHRpdGxlLCB3aGljaCB3YXMgdGhhdCB3ZSB3b3VsZCBjYWxsICtyZXN0b3JlR3Jh cGhpY3NTdGF0ZSBvbiBOU0dyYXBoaWNzQ29udGV4dAorICAgICAgICByZWdhcmRsZXNzIG9mIHdo ZXRoZXIgd2UgaGF2ZSBhIHBsYXRmb3JtIGNvbnRleHQgb3Igbm90ICh3aGlsZSB3ZSdkIG9ubHkg c2F2ZSBpZiB3ZSAvZGlkLyBoYXZlIG9uZSkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9pb3MvRm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZv bnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyOjp+Rm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXI6OnJlc3RvcmUpOiBE ZWxldGVkLgorICAgICAgICBNYWtlIEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyIGJlaGF2ZSBs aWtlIGFsbCBvZiB0aGUgb3RoZXIgLVN0YXRlU2F2ZXJzLCBwZXJmb3JtaW5nICJyZXN0b3JlIgor ICAgICAgICBpbiBpdHMgZGVzdHJ1Y3Rvci4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9MZWdh Y3lUaWxlQ2FjaGUubW06CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lUaWxlQ2FjaGU6OmRyYXdX aW5kb3dDb250ZW50KToKKyAgICAgICAgV2UgZG9uJ3QgaGF2ZSB0byByZXN0b3JlIGV4cGxpY2l0 bHkgYW55bW9yZS4KKwogMjAyMC0xMS0wOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgogCiAgICAgICAgIFVuZXhwb3NlIG9ic29sZXRlIEhUTUxBcHBsZXRFbGVtZW50IGludGVyZmFj ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2Ev UGxhdGZvcm1DQUxheWVyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQppbmRleCAyODg0NmY2YjkxNTYxMWI5 MmVmNzQwZDkzYTk4MWQwMDAzYTViNjljLi5mM2ZjMWU4YWIxYmZjODJhMWQ3Y2E5MjQ2ZGUzY2Ri M2IzYTJlNDYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQpAQCAtMzEsNiAr MzEsNyBAQAogI2ltcG9ydCAiR3JhcGhpY3NMYXllckNBLmgiCiAjaW1wb3J0ICJJT1N1cmZhY2Uu aCIKICNpbXBvcnQgIkxlbmd0aEZ1bmN0aW9ucy5oIgorI2ltcG9ydCAiTG9jYWxDdXJyZW50R3Jh cGhpY3NDb250ZXh0LmgiCiAjaW1wb3J0ICJQbGF0Zm9ybUNBQW5pbWF0aW9uQ29jb2EuaCIKICNp bXBvcnQgIlBsYXRmb3JtQ0FGaWx0ZXJzLmgiCiAjaW1wb3J0ICJTY3JvbGxiYXJUaGVtZU1hYy5o IgpAQCAtMTE1NSw2NSArMTE1Niw1MiBAQCB2b2lkIFBsYXRmb3JtQ0FMYXllcjo6ZHJhd0xheWVy Q29udGVudHMoR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIFdlYkNvcgogICAgIGlm ICghbGF5ZXJDb250ZW50cy0+cGxhdGZvcm1DQUxheWVyUmVwYWludENvdW50KHBsYXRmb3JtQ0FM YXllcikpCiAgICAgICAgIGxheWVyUGFpbnRCZWhhdmlvciB8PSBHcmFwaGljc0xheWVyUGFpbnRG aXJzdFRpbGVQYWludDsKIAotICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc2F2ZXIoZ3Jh cGhpY3NDb250ZXh0KTsKLQotICAgIC8vIFdlIG5ldmVyIHVzZSBDb21wb3NpdGluZ0Nvb3JkaW5h dGVzT3JpZW50YXRpb246OkJvdHRvbVVwIG9uIE1hYy4KLSAgICBBU1NFUlQobGF5ZXJDb250ZW50 cy0+cGxhdGZvcm1DQUxheWVyQ29udGVudHNPcmllbnRhdGlvbigpID09IEdyYXBoaWNzTGF5ZXI6 OkNvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbjo6VG9wRG93bik7Ci0KKyAgICB7Cisg ICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsK KyAgICAgICAgV1RGOjpPcHRpb25hbDxMb2NhbEN1cnJlbnRHcmFwaGljc0NvbnRleHQ+IHBsYXRm b3JtQ29udGV4dFNhdmVyOwogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgV1RGOjpPcHRp b25hbDxGb250QW50aWFsaWFzaW5nU3RhdGVTYXZlcj4gZm9udEFudGlhbGlhc2luZ1N0YXRlOwor ICAgICAgICBXVEY6Ok9wdGlvbmFsPEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyPiBmb250QW50 aWFsaWFzaW5nU3RhdGU7CiAjZW5kaWYKLSAgICBpZiAoZ3JhcGhpY3NDb250ZXh0Lmhhc1BsYXRm b3JtQ29udGV4dCgpKSB7Ci0gICAgICAgIENHQ29udGV4dFJlZiBjb250ZXh0ID0gZ3JhcGhpY3ND b250ZXh0LnBsYXRmb3JtQ29udGV4dCgpOwotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAg ICAgIFdLU2V0Q3VycmVudEdyYXBoaWNzQ29udGV4dChjb250ZXh0KTsKIAotICAgICAgICBmb250 QW50aWFsaWFzaW5nU3RhdGUgPSBGb250QW50aWFsaWFzaW5nU3RhdGVTYXZlciB7IGNvbnRleHQs ICEhW3BsYXRmb3JtQ0FMYXllci0+cGxhdGZvcm1MYXllcigpIGlzT3BhcXVlXSB9OwotICAgICAg ICBmb250QW50aWFsaWFzaW5nU3RhdGUtPnNldHVwKFtXQUtXaW5kb3cgaGFzTGFuZHNjYXBlT3Jp ZW50YXRpb25dKTsKLSNlbHNlCi0gICAgICAgIFtOU0dyYXBoaWNzQ29udGV4dCBzYXZlR3JhcGhp Y3NTdGF0ZV07CisgICAgICAgIC8vIFdlIG5ldmVyIHVzZSBDb21wb3NpdGluZ0Nvb3JkaW5hdGVz T3JpZW50YXRpb246OkJvdHRvbVVwIG9uIE1hYy4KKyAgICAgICAgQVNTRVJUKGxheWVyQ29udGVu dHMtPnBsYXRmb3JtQ0FMYXllckNvbnRlbnRzT3JpZW50YXRpb24oKSA9PSBHcmFwaGljc0xheWVy OjpDb21wb3NpdGluZ0Nvb3JkaW5hdGVzT3JpZW50YXRpb246OlRvcERvd24pOwogCi0gICAgICAg IC8vIFNldCB1cCBhbiBOU0dyYXBoaWNzQ29udGV4dCBmb3IgdGhlIGNvbnRleHQsIHNvIHRoYXQg cGFydHMgb2YgQXBwS2l0IHRoYXQgcmVseSBvbgotICAgICAgICAvLyB0aGUgY3VycmVudCBOU0dy YXBoaWNzQ29udGV4dCAoZS5nLiBOU0NlbGwgZHJhd2luZykgZ2V0IHRoZSByaWdodCBvbmUuCi0g ICAgICAgIE5TR3JhcGhpY3NDb250ZXh0KiBsYXllckNvbnRleHQgPSBbTlNHcmFwaGljc0NvbnRl eHQgZ3JhcGhpY3NDb250ZXh0V2l0aENHQ29udGV4dDpjb250ZXh0IGZsaXBwZWQ6WUVTXTsKLSAg ICAgICAgW05TR3JhcGhpY3NDb250ZXh0IHNldEN1cnJlbnRDb250ZXh0OmxheWVyQ29udGV4dF07 CisgICAgICAgIGlmIChncmFwaGljc0NvbnRleHQuaGFzUGxhdGZvcm1Db250ZXh0KCkpIHsKKyAg ICAgICAgICAgIHBsYXRmb3JtQ29udGV4dFNhdmVyLmVtcGxhY2UoZ3JhcGhpY3NDb250ZXh0KTsK KyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgICAgICAgICAgZm9udEFudGlhbGlhc2luZ1N0 YXRlLmVtcGxhY2UoY29udGV4dCwgISFbcGxhdGZvcm1DQUxheWVyLT5wbGF0Zm9ybUxheWVyKCkg aXNPcGFxdWVdKTsKKyAgICAgICAgICAgIGZvbnRBbnRpYWxpYXNpbmdTdGF0ZS0+c2V0dXAoW1dB S1dpbmRvdyBoYXNMYW5kc2NhcGVPcmllbnRhdGlvbl0pOwogI2VuZGlmCi0gICAgfQotICAgIAot ICAgIHsKLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldElzQ0FMYXllckNvbnRleHQodHJ1ZSk7 Ci0gICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRJc0FjY2VsZXJhdGVkQ29udGV4dChwbGF0Zm9y bUNBTGF5ZXItPmFjY2VsZXJhdGVzRHJhd2luZygpKTsKLQotICAgICAgICBpZiAoIWxheWVyQ29u dGVudHMtPnBsYXRmb3JtQ0FMYXllckNvbnRlbnRzT3BhcXVlKCkgJiYgIXBsYXRmb3JtQ0FMYXll ci0+c3VwcG9ydHNTdWJwaXhlbEFudGlhbGlhc2VkVGV4dCgpICYmIEZvbnRDYXNjYWRlOjppc1N1 YnBpeGVsQW50aWFsaWFzaW5nQXZhaWxhYmxlKCkpIHsKLSAgICAgICAgICAgIC8vIFR1cm4gb2Zm IGZvbnQgc21vb3RoaW5nIHRvIGltcHJvdmUgdGhlIGFwcGVhcmFuY2Ugb2YgdGV4dCByZW5kZXJl ZCBvbnRvIGEgdHJhbnNwYXJlbnQgYmFja2dyb3VuZC4KLSAgICAgICAgICAgIGdyYXBoaWNzQ29u dGV4dC5zZXRTaG91bGRTbW9vdGhGb250cyhmYWxzZSk7CiAgICAgICAgIH0KKyAgICAgICAgCisg ICAgICAgIHsKKyAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5zZXRJc0NBTGF5ZXJDb250ZXh0 KHRydWUpOworICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldElzQWNjZWxlcmF0ZWRDb250 ZXh0KHBsYXRmb3JtQ0FMYXllci0+YWNjZWxlcmF0ZXNEcmF3aW5nKCkpOworCisgICAgICAgICAg ICBpZiAoIWxheWVyQ29udGVudHMtPnBsYXRmb3JtQ0FMYXllckNvbnRlbnRzT3BhcXVlKCkgJiYg IXBsYXRmb3JtQ0FMYXllci0+c3VwcG9ydHNTdWJwaXhlbEFudGlhbGlhc2VkVGV4dCgpICYmIEZv bnRDYXNjYWRlOjppc1N1YnBpeGVsQW50aWFsaWFzaW5nQXZhaWxhYmxlKCkpIHsKKyAgICAgICAg ICAgICAgICAvLyBUdXJuIG9mZiBmb250IHNtb290aGluZyB0byBpbXByb3ZlIHRoZSBhcHBlYXJh bmNlIG9mIHRleHQgcmVuZGVyZWQgb250byBhIHRyYW5zcGFyZW50IGJhY2tncm91bmQuCisgICAg ICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldFNob3VsZFNtb290aEZvbnRzKGZhbHNlKTsK KyAgICAgICAgICAgIH0KIAogI2lmIFBMQVRGT1JNKE1BQykKLSAgICAgICAgLy8gSXQncyBpbXBv cnRhbnQgdG8gZ2V0IHRoZSBjbGlwIGZyb20gdGhlIGNvbnRleHQsIGJlY2F1c2UgaXQgbWF5IGJl IHNpZ25pZmljYW50bHkKLSAgICAgICAgLy8gc21hbGxlciB0aGFuIHRoZSBsYXllciBib3VuZHMg KGUuZy4gdGlsZWQgbGF5ZXJzKQotICAgICAgICBUaGVtZU1hYzo6c2V0Rm9jdXNSaW5nQ2xpcFJl Y3QoZ3JhcGhpY3NDb250ZXh0LmNsaXBCb3VuZHMoKSk7CisgICAgICAgICAgICAvLyBJdCdzIGlt cG9ydGFudCB0byBnZXQgdGhlIGNsaXAgZnJvbSB0aGUgY29udGV4dCwgYmVjYXVzZSBpdCBtYXkg YmUgc2lnbmlmaWNhbnRseQorICAgICAgICAgICAgLy8gc21hbGxlciB0aGFuIHRoZSBsYXllciBi b3VuZHMgKGUuZy4gdGlsZWQgbGF5ZXJzKQorICAgICAgICAgICAgVGhlbWVNYWM6OnNldEZvY3Vz UmluZ0NsaXBSZWN0KGdyYXBoaWNzQ29udGV4dC5jbGlwQm91bmRzKCkpOwogI2VuZGlmCiAKLSAg ICAgICAgZm9yIChjb25zdCBhdXRvJiByZWN0IDogZGlydHlSZWN0cykgewotICAgICAgICAgICAg R3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKGdyYXBoaWNzQ29udGV4dCk7Ci0g ICAgICAgICAgICBncmFwaGljc0NvbnRleHQuY2xpcChyZWN0KTsKKyAgICAgICAgICAgIGZvciAo Y29uc3QgYXV0byYgcmVjdCA6IGRpcnR5UmVjdHMpIHsKKyAgICAgICAgICAgICAgICBHcmFwaGlj c0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsKKyAgICAgICAg ICAgICAgICBncmFwaGljc0NvbnRleHQuY2xpcChyZWN0KTsKIAotICAgICAgICAgICAgbGF5ZXJD b250ZW50cy0+cGxhdGZvcm1DQUxheWVyUGFpbnRDb250ZW50cyhwbGF0Zm9ybUNBTGF5ZXIsIGdy YXBoaWNzQ29udGV4dCwgcmVjdCwgbGF5ZXJQYWludEJlaGF2aW9yKTsKLSAgICAgICAgfQorICAg ICAgICAgICAgICAgIGxheWVyQ29udGVudHMtPnBsYXRmb3JtQ0FMYXllclBhaW50Q29udGVudHMo cGxhdGZvcm1DQUxheWVyLCBncmFwaGljc0NvbnRleHQsIHJlY3QsIGxheWVyUGFpbnRCZWhhdmlv cik7CisgICAgICAgICAgICB9CiAKLSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgICAgICBp ZiAoZm9udEFudGlhbGlhc2luZ1N0YXRlKQotICAgICAgICAgICAgZm9udEFudGlhbGlhc2luZ1N0 YXRlLT5yZXN0b3JlKCk7Ci0jZWxzZQotICAgICAgICBUaGVtZU1hYzo6c2V0Rm9jdXNSaW5nQ2xp cFJlY3QoRmxvYXRSZWN0KCkpOwotCi0gICAgICAgIFtOU0dyYXBoaWNzQ29udGV4dCByZXN0b3Jl R3JhcGhpY3NTdGF0ZV07CisjaWYgUExBVEZPUk0oTUFDKQorICAgICAgICAgICAgVGhlbWVNYWM6 OnNldEZvY3VzUmluZ0NsaXBSZWN0KEZsb2F0UmVjdCgpKTsKICNlbmRpZgorICAgICAgICB9CiAg ICAgfQogCi0gICAgc2F2ZXIucmVzdG9yZSgpOwotCiAgICAgLy8gUmUtZmV0Y2ggdGhlIGxheWVy IG93bmVyLCBzaW5jZSA8cmRhcjovL3Byb2JsZW0vOTEyNTE1MT4gaW5kaWNhdGVzIHRoYXQgaXQg bWlnaHQgaGF2ZSBiZWVuIGRlc3Ryb3llZCBkdXJpbmcgcGFpbnRpbmcuCiAgICAgbGF5ZXJDb250 ZW50cyA9IHBsYXRmb3JtQ0FMYXllci0+b3duZXIoKTsKICAgICBBU1NFUlQobGF5ZXJDb250ZW50 cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9pb3MvRm9u dEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oCmluZGV4IGY3MGFmMjllZGZlMmJi NjA2ZmE0OGNmZDU4YjJhZDc5ZDZlODYzMDAuLjBkMTEwZTkxZTVjMDEwMTdjYTQyZmQ3MTFiMzFm NGE5NjlkMmUyYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oCkBAIC0zMyw2 ICszMyw3IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEZvbnRBbnRpYWxpYXNpbmdT dGF0ZVNhdmVyIHsKKyAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShGb250QW50aWFsaWFzaW5nU3Rh dGVTYXZlcik7CiBwdWJsaWM6CiAgICAgRm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIoQ0dDb250 ZXh0UmVmIGNvbnRleHQsIGJvb2wgdXNlT3JpZW50YXRpb25EZXBlbmRlbnRGb250QW50aWFsaWFz aW5nKQogI2lmICFQTEFURk9STShJT1NfRkFNSUxZX1NJTVVMQVRPUikKQEAgLTQ2LDYgKzQ3LDE0 IEBAIHB1YmxpYzoKICNlbmRpZgogICAgIH0KIAorICAgIH5Gb250QW50aWFsaWFzaW5nU3RhdGVT YXZlcigpCisgICAgeworI2lmICFQTEFURk9STShJT1NfRkFNSUxZX1NJTVVMQVRPUikKKyAgICAg ICAgaWYgKG1fdXNlT3JpZW50YXRpb25EZXBlbmRlbnRGb250QW50aWFsaWFzaW5nKQorICAgICAg ICAgICAgQ0dDb250ZXh0U2V0Rm9udEFudGlhbGlhc2luZ1N0eWxlKG1fY29udGV4dCwgbV9vbGRB bnRpYWxpYXNpbmdTdHlsZSk7CisjZW5kaWYKKyAgICB9CisKICAgICB2b2lkIHNldHVwKGJvb2wg aXNMYW5kc2NhcGVPcmllbnRhdGlvbikKICAgICB7CiAjaWYgIVBMQVRGT1JNKElPU19GQU1JTFlf U0lNVUxBVE9SKQpAQCAtNTgsMTQgKzY3LDYgQEAgcHVibGljOgogI2VuZGlmCiAgICAgfQogCi0g ICAgdm9pZCByZXN0b3JlKCkKLSAgICB7Ci0jaWYgIVBMQVRGT1JNKElPU19GQU1JTFlfU0lNVUxB VE9SKQotICAgICAgICBpZiAobV91c2VPcmllbnRhdGlvbkRlcGVuZGVudEZvbnRBbnRpYWxpYXNp bmcpCi0gICAgICAgICAgICBDR0NvbnRleHRTZXRGb250QW50aWFsaWFzaW5nU3R5bGUobV9jb250 ZXh0LCBtX29sZEFudGlhbGlhc2luZ1N0eWxlKTsKLSNlbmRpZgotICAgIH0KLQogcHJpdmF0ZToK ICNpZiAhUExBVEZPUk0oSU9TX0ZBTUlMWV9TSU1VTEFUT1IpCiAgICAgQ0dDb250ZXh0UmVmIG1f Y29udGV4dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9MZWdhY3lU aWxlQ2FjaGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvTGVnYWN5VGlsZUNhY2hl Lm1tCmluZGV4IDUzNzQwODY5MGRjY2ExNjllZGU5MjU2Yzk3YzgyMGUwZDlkZjEyZTAuLjUxNTUy MjI1ZTY0YjEyMDIyZDM3NTg0NjhjNjc5ZWYwOWFlYTVmYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2lvcy9MZWdhY3lUaWxlQ2FjaGUubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL0xlZ2FjeVRpbGVDYWNoZS5tbQpAQCAtNTM3LDggKzUzNyw2IEBAIHZv aWQgTGVnYWN5VGlsZUNhY2hlOjpkcmF3V2luZG93Q29udGVudChMZWdhY3lUaWxlTGF5ZXIqIGxh eWVyLCBDR0NvbnRleHRSZWYgY29uCiAgICAgICAgIENHUmVjdCBkaXJ0eVJlY3RJblN1cGVyID0g W2hvc3RMYXllcigpIGNvbnZlcnRSZWN0OmRpcnR5UmVjdCBmcm9tTGF5ZXI6bGF5ZXJdOwogICAg ICAgICBbbV93aW5kb3cgZGlzcGxheVJlY3Q6ZGlydHlSZWN0SW5TdXBlcl07CiAgICAgfQotCi0g ICAgZm9udEFudGlhbGlhc2luZ1N0YXRlLnJlc3RvcmUoKTsKICAgICAKICAgICBpZiAoZHJhd2lu Z0ZsYWdzID09IERyYXdpbmdGbGFnczo6U25hcHNob3R0aW5nKQogICAgICAgICBbbV93aW5kb3cg c2V0SXNJblNuYXBzaG90dGluZ1BhaW50Ok5PXTsK 413650 2020-11-09 18:11:18 -0800 2020-11-09 18:13:21 -0800 Patch bug-218731-20201109181117.patch text/plain 9233 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y3N2I2MDEwZmU4ZWIz NWMxOWE3NDI5OTBhODkzMTYxOTJmOTUyYy4uZTcxMWQzZTZhYWQ0MjNhZDM2MTI3MzJlYzI0Yzk0 NDcyZDA4NDg1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEV4Y2VwdGlvbnMg dW5kZXIgUGxhdGZvcm1DQUxheWVyQ29jb2E6OmRyYXdMYXllckNvbnRlbnRzIHdpdGggRGlzcGxh eUxpc3QtYmFja2VkIGxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgor CisgICAgICAgIE5vIG5ldyB0ZXN0czsgYWxsIHRlc3RzIHdpbGwgY292ZXIgdGhpcyBvbmNlIEdQ VSBQcm9jZXNzIGZvciBET00gcmVuZGVyaW5nIGxhbmRzLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW06CisgICAgICAgIChXZWJD b3JlOjpQbGF0Zm9ybUNBTGF5ZXI6OmRyYXdMYXllckNvbnRlbnRzKToKKyAgICAgICAgUmVmYWN0 b3IgdGhpcyBmdW5jdGlvbiB0byB1c2UgdGhyZWUgc3RhdGUgc2F2ZXJzLCBhbGwgcmVsZWFzZWQg Ynkgc2NvcGUgaW5zdGVhZCBvZiBleHBsaWNpdGx5LgorICAgICAgICBUaGlzIGZpeGVzIHRoZSBi dWcgaW4gdGhlIHRpdGxlLCB3aGljaCB3YXMgdGhhdCB3ZSB3b3VsZCBjYWxsICtyZXN0b3JlR3Jh cGhpY3NTdGF0ZSBvbiBOU0dyYXBoaWNzQ29udGV4dAorICAgICAgICByZWdhcmRsZXNzIG9mIHdo ZXRoZXIgd2UgaGF2ZSBhIHBsYXRmb3JtIGNvbnRleHQgb3Igbm90ICh3aGlsZSB3ZSdkIG9ubHkg c2F2ZSBpZiB3ZSAvZGlkLyBoYXZlIG9uZSkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9pb3MvRm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZv bnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyOjp+Rm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXI6OnJlc3RvcmUpOiBE ZWxldGVkLgorICAgICAgICBNYWtlIEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyIGJlaGF2ZSBs aWtlIGFsbCBvZiB0aGUgb3RoZXIgLVN0YXRlU2F2ZXJzLCBwZXJmb3JtaW5nICJyZXN0b3JlIgor ICAgICAgICBpbiBpdHMgZGVzdHJ1Y3Rvci4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9MZWdh Y3lUaWxlQ2FjaGUubW06CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lUaWxlQ2FjaGU6OmRyYXdX aW5kb3dDb250ZW50KToKKyAgICAgICAgV2UgZG9uJ3QgaGF2ZSB0byByZXN0b3JlIGV4cGxpY2l0 bHkgYW55bW9yZS4KKwogMjAyMC0xMS0wOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgogCiAgICAgICAgIFVuZXhwb3NlIG9ic29sZXRlIEhUTUxBcHBsZXRFbGVtZW50IGludGVyZmFj ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2Ev UGxhdGZvcm1DQUxheWVyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQppbmRleCAyODg0NmY2YjkxNTYxMWI5 MmVmNzQwZDkzYTk4MWQwMDAzYTViNjljLi40NDdiZjRkMmRhMzljNTc1MjIwMmM0MmE1OTQyNzQx NTM4NzQ1ZDE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQpAQCAtMzEsNiAr MzEsNyBAQAogI2ltcG9ydCAiR3JhcGhpY3NMYXllckNBLmgiCiAjaW1wb3J0ICJJT1N1cmZhY2Uu aCIKICNpbXBvcnQgIkxlbmd0aEZ1bmN0aW9ucy5oIgorI2ltcG9ydCAiTG9jYWxDdXJyZW50R3Jh cGhpY3NDb250ZXh0LmgiCiAjaW1wb3J0ICJQbGF0Zm9ybUNBQW5pbWF0aW9uQ29jb2EuaCIKICNp bXBvcnQgIlBsYXRmb3JtQ0FGaWx0ZXJzLmgiCiAjaW1wb3J0ICJTY3JvbGxiYXJUaGVtZU1hYy5o IgpAQCAtMTE1NSw2NSArMTE1Niw1MiBAQCB2b2lkIFBsYXRmb3JtQ0FMYXllcjo6ZHJhd0xheWVy Q29udGVudHMoR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIFdlYkNvcgogICAgIGlm ICghbGF5ZXJDb250ZW50cy0+cGxhdGZvcm1DQUxheWVyUmVwYWludENvdW50KHBsYXRmb3JtQ0FM YXllcikpCiAgICAgICAgIGxheWVyUGFpbnRCZWhhdmlvciB8PSBHcmFwaGljc0xheWVyUGFpbnRG aXJzdFRpbGVQYWludDsKIAotICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc2F2ZXIoZ3Jh cGhpY3NDb250ZXh0KTsKLQotICAgIC8vIFdlIG5ldmVyIHVzZSBDb21wb3NpdGluZ0Nvb3JkaW5h dGVzT3JpZW50YXRpb246OkJvdHRvbVVwIG9uIE1hYy4KLSAgICBBU1NFUlQobGF5ZXJDb250ZW50 cy0+cGxhdGZvcm1DQUxheWVyQ29udGVudHNPcmllbnRhdGlvbigpID09IEdyYXBoaWNzTGF5ZXI6 OkNvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbjo6VG9wRG93bik7Ci0KKyAgICB7Cisg ICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsK KyAgICAgICAgV1RGOjpPcHRpb25hbDxMb2NhbEN1cnJlbnRHcmFwaGljc0NvbnRleHQ+IHBsYXRm b3JtQ29udGV4dFNhdmVyOwogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgV1RGOjpPcHRp b25hbDxGb250QW50aWFsaWFzaW5nU3RhdGVTYXZlcj4gZm9udEFudGlhbGlhc2luZ1N0YXRlOwor ICAgICAgICBXVEY6Ok9wdGlvbmFsPEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyPiBmb250QW50 aWFsaWFzaW5nU3RhdGU7CiAjZW5kaWYKLSAgICBpZiAoZ3JhcGhpY3NDb250ZXh0Lmhhc1BsYXRm b3JtQ29udGV4dCgpKSB7Ci0gICAgICAgIENHQ29udGV4dFJlZiBjb250ZXh0ID0gZ3JhcGhpY3ND b250ZXh0LnBsYXRmb3JtQ29udGV4dCgpOwotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAg ICAgIFdLU2V0Q3VycmVudEdyYXBoaWNzQ29udGV4dChjb250ZXh0KTsKIAotICAgICAgICBmb250 QW50aWFsaWFzaW5nU3RhdGUgPSBGb250QW50aWFsaWFzaW5nU3RhdGVTYXZlciB7IGNvbnRleHQs ICEhW3BsYXRmb3JtQ0FMYXllci0+cGxhdGZvcm1MYXllcigpIGlzT3BhcXVlXSB9OwotICAgICAg ICBmb250QW50aWFsaWFzaW5nU3RhdGUtPnNldHVwKFtXQUtXaW5kb3cgaGFzTGFuZHNjYXBlT3Jp ZW50YXRpb25dKTsKLSNlbHNlCi0gICAgICAgIFtOU0dyYXBoaWNzQ29udGV4dCBzYXZlR3JhcGhp Y3NTdGF0ZV07CisgICAgICAgIC8vIFdlIG5ldmVyIHVzZSBDb21wb3NpdGluZ0Nvb3JkaW5hdGVz T3JpZW50YXRpb246OkJvdHRvbVVwIG9uIE1hYy4KKyAgICAgICAgQVNTRVJUKGxheWVyQ29udGVu dHMtPnBsYXRmb3JtQ0FMYXllckNvbnRlbnRzT3JpZW50YXRpb24oKSA9PSBHcmFwaGljc0xheWVy OjpDb21wb3NpdGluZ0Nvb3JkaW5hdGVzT3JpZW50YXRpb246OlRvcERvd24pOwogCi0gICAgICAg IC8vIFNldCB1cCBhbiBOU0dyYXBoaWNzQ29udGV4dCBmb3IgdGhlIGNvbnRleHQsIHNvIHRoYXQg cGFydHMgb2YgQXBwS2l0IHRoYXQgcmVseSBvbgotICAgICAgICAvLyB0aGUgY3VycmVudCBOU0dy YXBoaWNzQ29udGV4dCAoZS5nLiBOU0NlbGwgZHJhd2luZykgZ2V0IHRoZSByaWdodCBvbmUuCi0g ICAgICAgIE5TR3JhcGhpY3NDb250ZXh0KiBsYXllckNvbnRleHQgPSBbTlNHcmFwaGljc0NvbnRl eHQgZ3JhcGhpY3NDb250ZXh0V2l0aENHQ29udGV4dDpjb250ZXh0IGZsaXBwZWQ6WUVTXTsKLSAg ICAgICAgW05TR3JhcGhpY3NDb250ZXh0IHNldEN1cnJlbnRDb250ZXh0OmxheWVyQ29udGV4dF07 CisgICAgICAgIGlmIChncmFwaGljc0NvbnRleHQuaGFzUGxhdGZvcm1Db250ZXh0KCkpIHsKKyAg ICAgICAgICAgIHBsYXRmb3JtQ29udGV4dFNhdmVyLmVtcGxhY2UoZ3JhcGhpY3NDb250ZXh0KTsK KyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgICAgICAgICAgZm9udEFudGlhbGlhc2luZ1N0 YXRlLmVtcGxhY2UoZ3JhcGhpY3NDb250ZXh0LnBsYXRmb3JtQ29udGV4dCgpLCAhIVtwbGF0Zm9y bUNBTGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSBpc09wYXF1ZV0pOworICAgICAgICAgICAgZm9udEFu dGlhbGlhc2luZ1N0YXRlLT5zZXR1cChbV0FLV2luZG93IGhhc0xhbmRzY2FwZU9yaWVudGF0aW9u XSk7CiAjZW5kaWYKLSAgICB9Ci0gICAgCi0gICAgewotICAgICAgICBncmFwaGljc0NvbnRleHQu c2V0SXNDQUxheWVyQ29udGV4dCh0cnVlKTsKLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldElz QWNjZWxlcmF0ZWRDb250ZXh0KHBsYXRmb3JtQ0FMYXllci0+YWNjZWxlcmF0ZXNEcmF3aW5nKCkp OwotCi0gICAgICAgIGlmICghbGF5ZXJDb250ZW50cy0+cGxhdGZvcm1DQUxheWVyQ29udGVudHNP cGFxdWUoKSAmJiAhcGxhdGZvcm1DQUxheWVyLT5zdXBwb3J0c1N1YnBpeGVsQW50aWFsaWFzZWRU ZXh0KCkgJiYgRm9udENhc2NhZGU6OmlzU3VicGl4ZWxBbnRpYWxpYXNpbmdBdmFpbGFibGUoKSkg ewotICAgICAgICAgICAgLy8gVHVybiBvZmYgZm9udCBzbW9vdGhpbmcgdG8gaW1wcm92ZSB0aGUg YXBwZWFyYW5jZSBvZiB0ZXh0IHJlbmRlcmVkIG9udG8gYSB0cmFuc3BhcmVudCBiYWNrZ3JvdW5k LgotICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldFNob3VsZFNtb290aEZvbnRzKGZhbHNl KTsKICAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgeworICAgICAgICAgICAgZ3JhcGhpY3ND b250ZXh0LnNldElzQ0FMYXllckNvbnRleHQodHJ1ZSk7CisgICAgICAgICAgICBncmFwaGljc0Nv bnRleHQuc2V0SXNBY2NlbGVyYXRlZENvbnRleHQocGxhdGZvcm1DQUxheWVyLT5hY2NlbGVyYXRl c0RyYXdpbmcoKSk7CisKKyAgICAgICAgICAgIGlmICghbGF5ZXJDb250ZW50cy0+cGxhdGZvcm1D QUxheWVyQ29udGVudHNPcGFxdWUoKSAmJiAhcGxhdGZvcm1DQUxheWVyLT5zdXBwb3J0c1N1YnBp eGVsQW50aWFsaWFzZWRUZXh0KCkgJiYgRm9udENhc2NhZGU6OmlzU3VicGl4ZWxBbnRpYWxpYXNp bmdBdmFpbGFibGUoKSkgeworICAgICAgICAgICAgICAgIC8vIFR1cm4gb2ZmIGZvbnQgc21vb3Ro aW5nIHRvIGltcHJvdmUgdGhlIGFwcGVhcmFuY2Ugb2YgdGV4dCByZW5kZXJlZCBvbnRvIGEgdHJh bnNwYXJlbnQgYmFja2dyb3VuZC4KKyAgICAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQuc2V0 U2hvdWxkU21vb3RoRm9udHMoZmFsc2UpOworICAgICAgICAgICAgfQogCiAjaWYgUExBVEZPUk0o TUFDKQotICAgICAgICAvLyBJdCdzIGltcG9ydGFudCB0byBnZXQgdGhlIGNsaXAgZnJvbSB0aGUg Y29udGV4dCwgYmVjYXVzZSBpdCBtYXkgYmUgc2lnbmlmaWNhbnRseQotICAgICAgICAvLyBzbWFs bGVyIHRoYW4gdGhlIGxheWVyIGJvdW5kcyAoZS5nLiB0aWxlZCBsYXllcnMpCi0gICAgICAgIFRo ZW1lTWFjOjpzZXRGb2N1c1JpbmdDbGlwUmVjdChncmFwaGljc0NvbnRleHQuY2xpcEJvdW5kcygp KTsKKyAgICAgICAgICAgIC8vIEl0J3MgaW1wb3J0YW50IHRvIGdldCB0aGUgY2xpcCBmcm9tIHRo ZSBjb250ZXh0LCBiZWNhdXNlIGl0IG1heSBiZSBzaWduaWZpY2FudGx5CisgICAgICAgICAgICAv LyBzbWFsbGVyIHRoYW4gdGhlIGxheWVyIGJvdW5kcyAoZS5nLiB0aWxlZCBsYXllcnMpCisgICAg ICAgICAgICBUaGVtZU1hYzo6c2V0Rm9jdXNSaW5nQ2xpcFJlY3QoZ3JhcGhpY3NDb250ZXh0LmNs aXBCb3VuZHMoKSk7CiAjZW5kaWYKIAotICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIHJlY3QgOiBk aXJ0eVJlY3RzKSB7Ci0gICAgICAgICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRl U2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsKLSAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5jbGlw KHJlY3QpOworICAgICAgICAgICAgZm9yIChjb25zdCBhdXRvJiByZWN0IDogZGlydHlSZWN0cykg eworICAgICAgICAgICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihn cmFwaGljc0NvbnRleHQpOworICAgICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5jbGlwKHJl Y3QpOwogCi0gICAgICAgICAgICBsYXllckNvbnRlbnRzLT5wbGF0Zm9ybUNBTGF5ZXJQYWludENv bnRlbnRzKHBsYXRmb3JtQ0FMYXllciwgZ3JhcGhpY3NDb250ZXh0LCByZWN0LCBsYXllclBhaW50 QmVoYXZpb3IpOwotICAgICAgICB9CisgICAgICAgICAgICAgICAgbGF5ZXJDb250ZW50cy0+cGxh dGZvcm1DQUxheWVyUGFpbnRDb250ZW50cyhwbGF0Zm9ybUNBTGF5ZXIsIGdyYXBoaWNzQ29udGV4 dCwgcmVjdCwgbGF5ZXJQYWludEJlaGF2aW9yKTsKKyAgICAgICAgICAgIH0KIAotI2lmIFBMQVRG T1JNKElPU19GQU1JTFkpCi0gICAgICAgIGlmIChmb250QW50aWFsaWFzaW5nU3RhdGUpCi0gICAg ICAgICAgICBmb250QW50aWFsaWFzaW5nU3RhdGUtPnJlc3RvcmUoKTsKLSNlbHNlCi0gICAgICAg IFRoZW1lTWFjOjpzZXRGb2N1c1JpbmdDbGlwUmVjdChGbG9hdFJlY3QoKSk7Ci0KLSAgICAgICAg W05TR3JhcGhpY3NDb250ZXh0IHJlc3RvcmVHcmFwaGljc1N0YXRlXTsKKyNpZiBQTEFURk9STShN QUMpCisgICAgICAgICAgICBUaGVtZU1hYzo6c2V0Rm9jdXNSaW5nQ2xpcFJlY3QoRmxvYXRSZWN0 KCkpOwogI2VuZGlmCisgICAgICAgIH0KICAgICB9CiAKLSAgICBzYXZlci5yZXN0b3JlKCk7Ci0K ICAgICAvLyBSZS1mZXRjaCB0aGUgbGF5ZXIgb3duZXIsIHNpbmNlIDxyZGFyOi8vcHJvYmxlbS85 MTI1MTUxPiBpbmRpY2F0ZXMgdGhhdCBpdCBtaWdodCBoYXZlIGJlZW4gZGVzdHJveWVkIGR1cmlu ZyBwYWludGluZy4KICAgICBsYXllckNvbnRlbnRzID0gcGxhdGZvcm1DQUxheWVyLT5vd25lcigp OwogICAgIEFTU0VSVChsYXllckNvbnRlbnRzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNh dmVyLmgKaW5kZXggZjcwYWYyOWVkZmUyYmI2MDZmYTQ4Y2ZkNThiMmFkNzlkNmU4NjMwMC4uMGQx MTBlOTFlNWMwMTAxN2NhNDJmZDcxMWIzMWY0YTk2OWQyZTJjNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRBbnRpYWxp YXNpbmdTdGF0ZVNhdmVyLmgKQEAgLTMzLDYgKzMzLDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK IAogY2xhc3MgRm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIgeworICAgIFdURl9NQUtFX05PTkNP UFlBQkxFKEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyKTsKIHB1YmxpYzoKICAgICBGb250QW50 aWFsaWFzaW5nU3RhdGVTYXZlcihDR0NvbnRleHRSZWYgY29udGV4dCwgYm9vbCB1c2VPcmllbnRh dGlvbkRlcGVuZGVudEZvbnRBbnRpYWxpYXNpbmcpCiAjaWYgIVBMQVRGT1JNKElPU19GQU1JTFlf U0lNVUxBVE9SKQpAQCAtNDYsNiArNDcsMTQgQEAgcHVibGljOgogI2VuZGlmCiAgICAgfQogCisg ICAgfkZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyKCkKKyAgICB7CisjaWYgIVBMQVRGT1JNKElP U19GQU1JTFlfU0lNVUxBVE9SKQorICAgICAgICBpZiAobV91c2VPcmllbnRhdGlvbkRlcGVuZGVu dEZvbnRBbnRpYWxpYXNpbmcpCisgICAgICAgICAgICBDR0NvbnRleHRTZXRGb250QW50aWFsaWFz aW5nU3R5bGUobV9jb250ZXh0LCBtX29sZEFudGlhbGlhc2luZ1N0eWxlKTsKKyNlbmRpZgorICAg IH0KKwogICAgIHZvaWQgc2V0dXAoYm9vbCBpc0xhbmRzY2FwZU9yaWVudGF0aW9uKQogICAgIHsK ICNpZiAhUExBVEZPUk0oSU9TX0ZBTUlMWV9TSU1VTEFUT1IpCkBAIC01OCwxNCArNjcsNiBAQCBw dWJsaWM6CiAjZW5kaWYKICAgICB9CiAKLSAgICB2b2lkIHJlc3RvcmUoKQotICAgIHsKLSNpZiAh UExBVEZPUk0oSU9TX0ZBTUlMWV9TSU1VTEFUT1IpCi0gICAgICAgIGlmIChtX3VzZU9yaWVudGF0 aW9uRGVwZW5kZW50Rm9udEFudGlhbGlhc2luZykKLSAgICAgICAgICAgIENHQ29udGV4dFNldEZv bnRBbnRpYWxpYXNpbmdTdHlsZShtX2NvbnRleHQsIG1fb2xkQW50aWFsaWFzaW5nU3R5bGUpOwot I2VuZGlmCi0gICAgfQotCiBwcml2YXRlOgogI2lmICFQTEFURk9STShJT1NfRkFNSUxZX1NJTVVM QVRPUikKICAgICBDR0NvbnRleHRSZWYgbV9jb250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL0xlZ2FjeVRpbGVDYWNoZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9MZWdhY3lUaWxlQ2FjaGUubW0KaW5kZXggNTM3NDA4NjkwZGNjYTE2OWVkZTky NTZjOTdjODIwZTBkOWRmMTJlMC4uNTE1NTIyMjVlNjRiMTIwMjJkMzc1ODQ2OGM2NzllZjA5YWVh NWZiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0xlZ2FjeVRpbGVD YWNoZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvTGVnYWN5VGlsZUNhY2hl Lm1tCkBAIC01MzcsOCArNTM3LDYgQEAgdm9pZCBMZWdhY3lUaWxlQ2FjaGU6OmRyYXdXaW5kb3dD b250ZW50KExlZ2FjeVRpbGVMYXllciogbGF5ZXIsIENHQ29udGV4dFJlZiBjb24KICAgICAgICAg Q0dSZWN0IGRpcnR5UmVjdEluU3VwZXIgPSBbaG9zdExheWVyKCkgY29udmVydFJlY3Q6ZGlydHlS ZWN0IGZyb21MYXllcjpsYXllcl07CiAgICAgICAgIFttX3dpbmRvdyBkaXNwbGF5UmVjdDpkaXJ0 eVJlY3RJblN1cGVyXTsKICAgICB9Ci0KLSAgICBmb250QW50aWFsaWFzaW5nU3RhdGUucmVzdG9y ZSgpOwogICAgIAogICAgIGlmIChkcmF3aW5nRmxhZ3MgPT0gRHJhd2luZ0ZsYWdzOjpTbmFwc2hv dHRpbmcpCiAgICAgICAgIFttX3dpbmRvdyBzZXRJc0luU25hcHNob3R0aW5nUGFpbnQ6Tk9dOwo= 413651 2020-11-09 18:13:23 -0800 2020-11-09 23:42:53 -0800 Patch bug-218731-20201109181322.patch text/plain 9329 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5NjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Y3N2I2MDEwZmU4ZWIz NWMxOWE3NDI5OTBhODkzMTYxOTJmOTUyYy4uZTcxMWQzZTZhYWQ0MjNhZDM2MTI3MzJlYzI0Yzk0 NDcyZDA4NDg1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTExLTA5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEV4Y2VwdGlvbnMg dW5kZXIgUGxhdGZvcm1DQUxheWVyQ29jb2E6OmRyYXdMYXllckNvbnRlbnRzIHdpdGggRGlzcGxh eUxpc3QtYmFja2VkIGxheWVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjE4NzMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gRnJhc2VyLgor CisgICAgICAgIE5vIG5ldyB0ZXN0czsgYWxsIHRlc3RzIHdpbGwgY292ZXIgdGhpcyBvbmNlIEdQ VSBQcm9jZXNzIGZvciBET00gcmVuZGVyaW5nIGxhbmRzLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW06CisgICAgICAgIChXZWJD b3JlOjpQbGF0Zm9ybUNBTGF5ZXI6OmRyYXdMYXllckNvbnRlbnRzKToKKyAgICAgICAgUmVmYWN0 b3IgdGhpcyBmdW5jdGlvbiB0byB1c2UgdGhyZWUgc3RhdGUgc2F2ZXJzLCBhbGwgcmVsZWFzZWQg Ynkgc2NvcGUgaW5zdGVhZCBvZiBleHBsaWNpdGx5LgorICAgICAgICBUaGlzIGZpeGVzIHRoZSBi dWcgaW4gdGhlIHRpdGxlLCB3aGljaCB3YXMgdGhhdCB3ZSB3b3VsZCBjYWxsICtyZXN0b3JlR3Jh cGhpY3NTdGF0ZSBvbiBOU0dyYXBoaWNzQ29udGV4dAorICAgICAgICByZWdhcmRsZXNzIG9mIHdo ZXRoZXIgd2UgaGF2ZSBhIHBsYXRmb3JtIGNvbnRleHQgb3Igbm90ICh3aGlsZSB3ZSdkIG9ubHkg c2F2ZSBpZiB3ZSAvZGlkLyBoYXZlIG9uZSkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9pb3MvRm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZv bnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyOjp+Rm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXIpOgor ICAgICAgICAoV2ViQ29yZTo6Rm9udEFudGlhbGlhc2luZ1N0YXRlU2F2ZXI6OnJlc3RvcmUpOiBE ZWxldGVkLgorICAgICAgICBNYWtlIEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyIGJlaGF2ZSBs aWtlIGFsbCBvZiB0aGUgb3RoZXIgLVN0YXRlU2F2ZXJzLCBwZXJmb3JtaW5nICJyZXN0b3JlIgor ICAgICAgICBpbiBpdHMgZGVzdHJ1Y3Rvci4KKworICAgICAgICAqIHBsYXRmb3JtL2lvcy9MZWdh Y3lUaWxlQ2FjaGUubW06CisgICAgICAgIChXZWJDb3JlOjpMZWdhY3lUaWxlQ2FjaGU6OmRyYXdX aW5kb3dDb250ZW50KToKKyAgICAgICAgV2UgZG9uJ3QgaGF2ZSB0byByZXN0b3JlIGV4cGxpY2l0 bHkgYW55bW9yZS4KKwogMjAyMC0xMS0wOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgogCiAgICAgICAgIFVuZXhwb3NlIG9ic29sZXRlIEhUTUxBcHBsZXRFbGVtZW50IGludGVyZmFj ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2Ev UGxhdGZvcm1DQUxheWVyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQppbmRleCAyODg0NmY2YjkxNTYxMWI5 MmVmNzQwZDkzYTk4MWQwMDAzYTViNjljLi4yOTE4YmI4ZWU2NzFhYTk4Yjc3ZWFlOTlkYzM1NmVh NTdlMjQ5N2ViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQpAQCAtMzEsNiAr MzEsNyBAQAogI2ltcG9ydCAiR3JhcGhpY3NMYXllckNBLmgiCiAjaW1wb3J0ICJJT1N1cmZhY2Uu aCIKICNpbXBvcnQgIkxlbmd0aEZ1bmN0aW9ucy5oIgorI2ltcG9ydCAiTG9jYWxDdXJyZW50R3Jh cGhpY3NDb250ZXh0LmgiCiAjaW1wb3J0ICJQbGF0Zm9ybUNBQW5pbWF0aW9uQ29jb2EuaCIKICNp bXBvcnQgIlBsYXRmb3JtQ0FGaWx0ZXJzLmgiCiAjaW1wb3J0ICJTY3JvbGxiYXJUaGVtZU1hYy5o IgpAQCAtMTE1NSw2NSArMTE1Niw1NCBAQCB2b2lkIFBsYXRmb3JtQ0FMYXllcjo6ZHJhd0xheWVy Q29udGVudHMoR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIFdlYkNvcgogICAgIGlm ICghbGF5ZXJDb250ZW50cy0+cGxhdGZvcm1DQUxheWVyUmVwYWludENvdW50KHBsYXRmb3JtQ0FM YXllcikpCiAgICAgICAgIGxheWVyUGFpbnRCZWhhdmlvciB8PSBHcmFwaGljc0xheWVyUGFpbnRG aXJzdFRpbGVQYWludDsKIAotICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc2F2ZXIoZ3Jh cGhpY3NDb250ZXh0KTsKLQotICAgIC8vIFdlIG5ldmVyIHVzZSBDb21wb3NpdGluZ0Nvb3JkaW5h dGVzT3JpZW50YXRpb246OkJvdHRvbVVwIG9uIE1hYy4KLSAgICBBU1NFUlQobGF5ZXJDb250ZW50 cy0+cGxhdGZvcm1DQUxheWVyQ29udGVudHNPcmllbnRhdGlvbigpID09IEdyYXBoaWNzTGF5ZXI6 OkNvbXBvc2l0aW5nQ29vcmRpbmF0ZXNPcmllbnRhdGlvbjo6VG9wRG93bik7Ci0KKyAgICB7Cisg ICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc2F2ZXIoZ3JhcGhpY3NDb250ZXh0KTsK KyAgICAgICAgV1RGOjpPcHRpb25hbDxMb2NhbEN1cnJlbnRHcmFwaGljc0NvbnRleHQ+IHBsYXRm b3JtQ29udGV4dFNhdmVyOwogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAgV1RGOjpPcHRp b25hbDxGb250QW50aWFsaWFzaW5nU3RhdGVTYXZlcj4gZm9udEFudGlhbGlhc2luZ1N0YXRlOwor ICAgICAgICBXVEY6Ok9wdGlvbmFsPEZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyPiBmb250QW50 aWFsaWFzaW5nU3RhdGU7CiAjZW5kaWYKLSAgICBpZiAoZ3JhcGhpY3NDb250ZXh0Lmhhc1BsYXRm b3JtQ29udGV4dCgpKSB7Ci0gICAgICAgIENHQ29udGV4dFJlZiBjb250ZXh0ID0gZ3JhcGhpY3ND b250ZXh0LnBsYXRmb3JtQ29udGV4dCgpOwotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0gICAg ICAgIFdLU2V0Q3VycmVudEdyYXBoaWNzQ29udGV4dChjb250ZXh0KTsKIAotICAgICAgICBmb250 QW50aWFsaWFzaW5nU3RhdGUgPSBGb250QW50aWFsaWFzaW5nU3RhdGVTYXZlciB7IGNvbnRleHQs ICEhW3BsYXRmb3JtQ0FMYXllci0+cGxhdGZvcm1MYXllcigpIGlzT3BhcXVlXSB9OwotICAgICAg ICBmb250QW50aWFsaWFzaW5nU3RhdGUtPnNldHVwKFtXQUtXaW5kb3cgaGFzTGFuZHNjYXBlT3Jp ZW50YXRpb25dKTsKLSNlbHNlCi0gICAgICAgIFtOU0dyYXBoaWNzQ29udGV4dCBzYXZlR3JhcGhp Y3NTdGF0ZV07CisgICAgICAgIC8vIFdlIG5ldmVyIHVzZSBDb21wb3NpdGluZ0Nvb3JkaW5hdGVz T3JpZW50YXRpb246OkJvdHRvbVVwIG9uIE1hYy4KKyAgICAgICAgQVNTRVJUKGxheWVyQ29udGVu dHMtPnBsYXRmb3JtQ0FMYXllckNvbnRlbnRzT3JpZW50YXRpb24oKSA9PSBHcmFwaGljc0xheWVy OjpDb21wb3NpdGluZ0Nvb3JkaW5hdGVzT3JpZW50YXRpb246OlRvcERvd24pOwogCi0gICAgICAg IC8vIFNldCB1cCBhbiBOU0dyYXBoaWNzQ29udGV4dCBmb3IgdGhlIGNvbnRleHQsIHNvIHRoYXQg cGFydHMgb2YgQXBwS2l0IHRoYXQgcmVseSBvbgotICAgICAgICAvLyB0aGUgY3VycmVudCBOU0dy YXBoaWNzQ29udGV4dCAoZS5nLiBOU0NlbGwgZHJhd2luZykgZ2V0IHRoZSByaWdodCBvbmUuCi0g ICAgICAgIE5TR3JhcGhpY3NDb250ZXh0KiBsYXllckNvbnRleHQgPSBbTlNHcmFwaGljc0NvbnRl eHQgZ3JhcGhpY3NDb250ZXh0V2l0aENHQ29udGV4dDpjb250ZXh0IGZsaXBwZWQ6WUVTXTsKLSAg ICAgICAgW05TR3JhcGhpY3NDb250ZXh0IHNldEN1cnJlbnRDb250ZXh0OmxheWVyQ29udGV4dF07 CisgICAgICAgIGlmIChncmFwaGljc0NvbnRleHQuaGFzUGxhdGZvcm1Db250ZXh0KCkpIHsKKyAg ICAgICAgICAgIHBsYXRmb3JtQ29udGV4dFNhdmVyLmVtcGxhY2UoZ3JhcGhpY3NDb250ZXh0KTsK KyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgICAgICAgICAgQ0dDb250ZXh0UmVmIGNvbnRl eHQgPSBncmFwaGljc0NvbnRleHQucGxhdGZvcm1Db250ZXh0KCk7CisgICAgICAgICAgICBXS1Nl dEN1cnJlbnRHcmFwaGljc0NvbnRleHQoY29udGV4dCk7CisgICAgICAgICAgICBmb250QW50aWFs aWFzaW5nU3RhdGUuZW1wbGFjZShjb250ZXh0LCAhIVtwbGF0Zm9ybUNBTGF5ZXItPnBsYXRmb3Jt TGF5ZXIoKSBpc09wYXF1ZV0pOworICAgICAgICAgICAgZm9udEFudGlhbGlhc2luZ1N0YXRlLT5z ZXR1cChbV0FLV2luZG93IGhhc0xhbmRzY2FwZU9yaWVudGF0aW9uXSk7CiAjZW5kaWYKLSAgICB9 Ci0gICAgCi0gICAgewotICAgICAgICBncmFwaGljc0NvbnRleHQuc2V0SXNDQUxheWVyQ29udGV4 dCh0cnVlKTsKLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldElzQWNjZWxlcmF0ZWRDb250ZXh0 KHBsYXRmb3JtQ0FMYXllci0+YWNjZWxlcmF0ZXNEcmF3aW5nKCkpOwotCi0gICAgICAgIGlmICgh bGF5ZXJDb250ZW50cy0+cGxhdGZvcm1DQUxheWVyQ29udGVudHNPcGFxdWUoKSAmJiAhcGxhdGZv cm1DQUxheWVyLT5zdXBwb3J0c1N1YnBpeGVsQW50aWFsaWFzZWRUZXh0KCkgJiYgRm9udENhc2Nh ZGU6OmlzU3VicGl4ZWxBbnRpYWxpYXNpbmdBdmFpbGFibGUoKSkgewotICAgICAgICAgICAgLy8g VHVybiBvZmYgZm9udCBzbW9vdGhpbmcgdG8gaW1wcm92ZSB0aGUgYXBwZWFyYW5jZSBvZiB0ZXh0 IHJlbmRlcmVkIG9udG8gYSB0cmFuc3BhcmVudCBiYWNrZ3JvdW5kLgotICAgICAgICAgICAgZ3Jh cGhpY3NDb250ZXh0LnNldFNob3VsZFNtb290aEZvbnRzKGZhbHNlKTsKICAgICAgICAgfQorICAg ICAgICAKKyAgICAgICAgeworICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldElzQ0FMYXll ckNvbnRleHQodHJ1ZSk7CisgICAgICAgICAgICBncmFwaGljc0NvbnRleHQuc2V0SXNBY2NlbGVy YXRlZENvbnRleHQocGxhdGZvcm1DQUxheWVyLT5hY2NlbGVyYXRlc0RyYXdpbmcoKSk7CisKKyAg ICAgICAgICAgIGlmICghbGF5ZXJDb250ZW50cy0+cGxhdGZvcm1DQUxheWVyQ29udGVudHNPcGFx dWUoKSAmJiAhcGxhdGZvcm1DQUxheWVyLT5zdXBwb3J0c1N1YnBpeGVsQW50aWFsaWFzZWRUZXh0 KCkgJiYgRm9udENhc2NhZGU6OmlzU3VicGl4ZWxBbnRpYWxpYXNpbmdBdmFpbGFibGUoKSkgewor ICAgICAgICAgICAgICAgIC8vIFR1cm4gb2ZmIGZvbnQgc21vb3RoaW5nIHRvIGltcHJvdmUgdGhl IGFwcGVhcmFuY2Ugb2YgdGV4dCByZW5kZXJlZCBvbnRvIGEgdHJhbnNwYXJlbnQgYmFja2dyb3Vu ZC4KKyAgICAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQuc2V0U2hvdWxkU21vb3RoRm9udHMo ZmFsc2UpOworICAgICAgICAgICAgfQogCiAjaWYgUExBVEZPUk0oTUFDKQotICAgICAgICAvLyBJ dCdzIGltcG9ydGFudCB0byBnZXQgdGhlIGNsaXAgZnJvbSB0aGUgY29udGV4dCwgYmVjYXVzZSBp dCBtYXkgYmUgc2lnbmlmaWNhbnRseQotICAgICAgICAvLyBzbWFsbGVyIHRoYW4gdGhlIGxheWVy IGJvdW5kcyAoZS5nLiB0aWxlZCBsYXllcnMpCi0gICAgICAgIFRoZW1lTWFjOjpzZXRGb2N1c1Jp bmdDbGlwUmVjdChncmFwaGljc0NvbnRleHQuY2xpcEJvdW5kcygpKTsKKyAgICAgICAgICAgIC8v IEl0J3MgaW1wb3J0YW50IHRvIGdldCB0aGUgY2xpcCBmcm9tIHRoZSBjb250ZXh0LCBiZWNhdXNl IGl0IG1heSBiZSBzaWduaWZpY2FudGx5CisgICAgICAgICAgICAvLyBzbWFsbGVyIHRoYW4gdGhl IGxheWVyIGJvdW5kcyAoZS5nLiB0aWxlZCBsYXllcnMpCisgICAgICAgICAgICBUaGVtZU1hYzo6 c2V0Rm9jdXNSaW5nQ2xpcFJlY3QoZ3JhcGhpY3NDb250ZXh0LmNsaXBCb3VuZHMoKSk7CiAjZW5k aWYKIAotICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIHJlY3QgOiBkaXJ0eVJlY3RzKSB7Ci0gICAg ICAgICAgICBHcmFwaGljc0NvbnRleHRTdGF0ZVNhdmVyIHN0YXRlU2F2ZXIoZ3JhcGhpY3NDb250 ZXh0KTsKLSAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5jbGlwKHJlY3QpOworICAgICAgICAg ICAgZm9yIChjb25zdCBhdXRvJiByZWN0IDogZGlydHlSZWN0cykgeworICAgICAgICAgICAgICAg IEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihncmFwaGljc0NvbnRleHQpOwor ICAgICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC5jbGlwKHJlY3QpOwogCi0gICAgICAgICAg ICBsYXllckNvbnRlbnRzLT5wbGF0Zm9ybUNBTGF5ZXJQYWludENvbnRlbnRzKHBsYXRmb3JtQ0FM YXllciwgZ3JhcGhpY3NDb250ZXh0LCByZWN0LCBsYXllclBhaW50QmVoYXZpb3IpOwotICAgICAg ICB9CisgICAgICAgICAgICAgICAgbGF5ZXJDb250ZW50cy0+cGxhdGZvcm1DQUxheWVyUGFpbnRD b250ZW50cyhwbGF0Zm9ybUNBTGF5ZXIsIGdyYXBoaWNzQ29udGV4dCwgcmVjdCwgbGF5ZXJQYWlu dEJlaGF2aW9yKTsKKyAgICAgICAgICAgIH0KIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi0g ICAgICAgIGlmIChmb250QW50aWFsaWFzaW5nU3RhdGUpCi0gICAgICAgICAgICBmb250QW50aWFs aWFzaW5nU3RhdGUtPnJlc3RvcmUoKTsKLSNlbHNlCi0gICAgICAgIFRoZW1lTWFjOjpzZXRGb2N1 c1JpbmdDbGlwUmVjdChGbG9hdFJlY3QoKSk7Ci0KLSAgICAgICAgW05TR3JhcGhpY3NDb250ZXh0 IHJlc3RvcmVHcmFwaGljc1N0YXRlXTsKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAgICAgICBU aGVtZU1hYzo6c2V0Rm9jdXNSaW5nQ2xpcFJlY3QoRmxvYXRSZWN0KCkpOwogI2VuZGlmCisgICAg ICAgIH0KICAgICB9CiAKLSAgICBzYXZlci5yZXN0b3JlKCk7Ci0KICAgICAvLyBSZS1mZXRjaCB0 aGUgbGF5ZXIgb3duZXIsIHNpbmNlIDxyZGFyOi8vcHJvYmxlbS85MTI1MTUxPiBpbmRpY2F0ZXMg dGhhdCBpdCBtaWdodCBoYXZlIGJlZW4gZGVzdHJveWVkIGR1cmluZyBwYWludGluZy4KICAgICBs YXllckNvbnRlbnRzID0gcGxhdGZvcm1DQUxheWVyLT5vd25lcigpOwogICAgIEFTU0VSVChsYXll ckNvbnRlbnRzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2lvcy9Gb250QW50aWFsaWFzaW5nU3RhdGVTYXZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvaW9zL0ZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyLmgKaW5kZXggZjcwYWYy OWVkZmUyYmI2MDZmYTQ4Y2ZkNThiMmFkNzlkNmU4NjMwMC4uMGQxMTBlOTFlNWMwMTAxN2NhNDJm ZDcxMWIzMWY0YTk2OWQyZTJjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvaW9zL0ZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaW9zL0ZvbnRBbnRpYWxpYXNpbmdTdGF0ZVNhdmVyLmgK QEAgLTMzLDYgKzMzLDcgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgRm9udEFudGlh bGlhc2luZ1N0YXRlU2F2ZXIgeworICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEZvbnRBbnRpYWxp YXNpbmdTdGF0ZVNhdmVyKTsKIHB1YmxpYzoKICAgICBGb250QW50aWFsaWFzaW5nU3RhdGVTYXZl cihDR0NvbnRleHRSZWYgY29udGV4dCwgYm9vbCB1c2VPcmllbnRhdGlvbkRlcGVuZGVudEZvbnRB bnRpYWxpYXNpbmcpCiAjaWYgIVBMQVRGT1JNKElPU19GQU1JTFlfU0lNVUxBVE9SKQpAQCAtNDYs NiArNDcsMTQgQEAgcHVibGljOgogI2VuZGlmCiAgICAgfQogCisgICAgfkZvbnRBbnRpYWxpYXNp bmdTdGF0ZVNhdmVyKCkKKyAgICB7CisjaWYgIVBMQVRGT1JNKElPU19GQU1JTFlfU0lNVUxBVE9S KQorICAgICAgICBpZiAobV91c2VPcmllbnRhdGlvbkRlcGVuZGVudEZvbnRBbnRpYWxpYXNpbmcp CisgICAgICAgICAgICBDR0NvbnRleHRTZXRGb250QW50aWFsaWFzaW5nU3R5bGUobV9jb250ZXh0 LCBtX29sZEFudGlhbGlhc2luZ1N0eWxlKTsKKyNlbmRpZgorICAgIH0KKwogICAgIHZvaWQgc2V0 dXAoYm9vbCBpc0xhbmRzY2FwZU9yaWVudGF0aW9uKQogICAgIHsKICNpZiAhUExBVEZPUk0oSU9T X0ZBTUlMWV9TSU1VTEFUT1IpCkBAIC01OCwxNCArNjcsNiBAQCBwdWJsaWM6CiAjZW5kaWYKICAg ICB9CiAKLSAgICB2b2lkIHJlc3RvcmUoKQotICAgIHsKLSNpZiAhUExBVEZPUk0oSU9TX0ZBTUlM WV9TSU1VTEFUT1IpCi0gICAgICAgIGlmIChtX3VzZU9yaWVudGF0aW9uRGVwZW5kZW50Rm9udEFu dGlhbGlhc2luZykKLSAgICAgICAgICAgIENHQ29udGV4dFNldEZvbnRBbnRpYWxpYXNpbmdTdHls ZShtX2NvbnRleHQsIG1fb2xkQW50aWFsaWFzaW5nU3R5bGUpOwotI2VuZGlmCi0gICAgfQotCiBw cml2YXRlOgogI2lmICFQTEFURk9STShJT1NfRkFNSUxZX1NJTVVMQVRPUikKICAgICBDR0NvbnRl eHRSZWYgbV9jb250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L0xlZ2FjeVRpbGVDYWNoZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9MZWdhY3lU aWxlQ2FjaGUubW0KaW5kZXggNTM3NDA4NjkwZGNjYTE2OWVkZTkyNTZjOTdjODIwZTBkOWRmMTJl MC4uNTE1NTIyMjVlNjRiMTIwMjJkMzc1ODQ2OGM2NzllZjA5YWVhNWZiZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0xlZ2FjeVRpbGVDYWNoZS5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvTGVnYWN5VGlsZUNhY2hlLm1tCkBAIC01MzcsOCArNTM3 LDYgQEAgdm9pZCBMZWdhY3lUaWxlQ2FjaGU6OmRyYXdXaW5kb3dDb250ZW50KExlZ2FjeVRpbGVM YXllciogbGF5ZXIsIENHQ29udGV4dFJlZiBjb24KICAgICAgICAgQ0dSZWN0IGRpcnR5UmVjdElu U3VwZXIgPSBbaG9zdExheWVyKCkgY29udmVydFJlY3Q6ZGlydHlSZWN0IGZyb21MYXllcjpsYXll cl07CiAgICAgICAgIFttX3dpbmRvdyBkaXNwbGF5UmVjdDpkaXJ0eVJlY3RJblN1cGVyXTsKICAg ICB9Ci0KLSAgICBmb250QW50aWFsaWFzaW5nU3RhdGUucmVzdG9yZSgpOwogICAgIAogICAgIGlm IChkcmF3aW5nRmxhZ3MgPT0gRHJhd2luZ0ZsYWdzOjpTbmFwc2hvdHRpbmcpCiAgICAgICAgIFtt X3dpbmRvdyBzZXRJc0luU25hcHNob3R0aW5nUGFpbnQ6Tk9dOwo=