178260 2017-10-13 07:04:24 -0700 [css-grid] Avoid clearing the overrideContainingBlockWidth if possible 2017-11-15 13:05:45 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=178336 InRadar P2 Normal --- 1 jfernandez jfernandez bfulgham commit-queue jfernandez rego simon.fraser svillar webkit-bug-importer zalan oldest_to_newest 1359992 0 jfernandez 2017-10-13 07:04:24 -0700 We are clearing/update the overrideContainingBLockWidth in some cases that is not necessary; in some cases we do it due orthogonal flows logic needs. I think this unneeded clear/updates operations may lead to unexpected behaviors when computing intrinsic size, so we must avoid it when possible. 1359995 1 323667 jfernandez 2017-10-13 07:19:33 -0700 Created attachment 323667 Patch 1360711 2 323881 jfernandez 2017-10-16 03:19:37 -0700 Created attachment 323881 Patch 1364216 3 323881 svillar 2017-10-25 08:47:09 -0700 Comment on attachment 323881 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323881&action=review > Source/WebCore/ChangeLog:17 > + This changes is a defensive approach to avoid the issues caused by Nit: change 1364223 4 324829 jfernandez 2017-10-25 09:03:05 -0700 Created attachment 324829 Patch 1364230 5 324829 commit-queue 2017-10-25 09:38:18 -0700 Comment on attachment 324829 Patch Clearing flags on attachment: 324829 Committed r223955: <https://trac.webkit.org/changeset/223955> 1364231 6 commit-queue 2017-10-25 09:38:19 -0700 All reviewed patches have been landed. Closing bug. 1372357 7 webkit-bug-importer 2017-11-15 13:05:45 -0800 <rdar://problem/35568771> 323667 2017-10-13 07:19:33 -0700 2017-10-16 03:19:33 -0700 Patch bug-178260-20171013161931.patch text/plain 10849 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyMzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGNjMzA4MTUwOWNkOTVl N2NiMmM5NDBkOTI1ZTgyY2VjMjExMTFkNS4uNmM2YmVlYTY4YmVhODRlNjc4NDEzMjk1Y2Y3YzJk MzE4ZjRkNjQ4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTEwLTEzICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gQXZvaWQgY2xlYXJpbmcgdGhlIG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrV2lkdGggaWYgcG9z c2libGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 ODI2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNp bmNlIHRoZSBpbnRyaW5zaWMgd2lkdGggY29tcHV0YXRpb24gdXNlcyB0aGUgc2FtZSBsb2dpYyB0 aGFuIHRoZQorICAgICAgICB0cmFjayBzaXppbmcgYWxnb3JpdGhtIHdlIGFyZSBjbGVhcmluZyB0 aGUgb3ZlcnJpZGVDb250YWluaW5nQmxvY2tXaWR0aAorICAgICAgICBvZiBzb21lIGdyaWQgaXRl bXMgdGhhdCBhcmUgcmVxdWlyZWQgdG8gbGFpZCBvdXQgdGhlbSBwcm9wZXJseS4KKworICAgICAg ICBJdCdzIHZlcnkgdW5jb21tb24gdGhhdCBhbnkgaW50cmluc2ljIHNpemUgY29tcHV0YXRpb24g aXNuJ3QgcGVyZm9ybWVkCisgICAgICAgIGFzIHBhcnQgb2YgYSBsYXlvdXQgcHJvY2Vzcy4gSG93 ZXZlciwgaWYgaXQgaGFwcGVucywgb25jZSBjbGVhcmVkIHRoZQorICAgICAgICBvdmVycmlkZUNv bnRhaW5pbmdCbG9ja1dpZHRoIGl0IG1heSBsZWFkIHRvIGFuIGluY29ycmVjdCBsYXlvdXQgb2Yg dGhlCisgICAgICAgIGFmZmVjdGVkIGdyaWQgaXRlbXMuCisKKyAgICAgICAgVGhpcyBjaGFuZ2Vz IGlzIGEgZGVmZW5zaXZlIGFwcHJvYWNoIHRvIGF2b2lkIHRoZSBpc3N1ZXMgY2F1c2VkIGJ5Cisg ICAgICAgIHN1Y2ggb2ZmLWxheW91dCBwcmVmZXJyZWQgc2l6ZSByZXF1ZXN0cywgd2hpY2ggbWF5 IGltcGx5IHJlY29tcHV0aW5nCisgICAgICAgIHRoZSBncmlkIGNvbnRhaW5lciBpbnRyaW5zaWMg c2l6ZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGJlY2F1c2Ugd2UgYXJlIG9ubHkgcmVtb3Zp bmcgc29tZSByZWR1bmRhbnQgbG9naWMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvR3JpZFRyYWNr U2l6aW5nQWxnb3JpdGhtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFja1NpemluZ0Fs Z29yaXRobVN0cmF0ZWd5OjptaW5Db250ZW50Rm9yQ2hpbGQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6R3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3k6Om1heENvbnRlbnRGb3JDaGls ZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmlkVHJhY2tTaXppbmdBbGdvcml0aG1TdHJh dGVneTo6bWluU2l6ZUZvckNoaWxkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFj a1NpemluZ0FsZ29yaXRobVN0cmF0ZWd5Ojp1cGRhdGVPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0Nv bnRlbnRTaXplRm9yQ2hpbGQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5kZWZpbml0ZVNp emVTdHJhdGVneTo6bWluTG9naWNhbFdpZHRoRm9yQ2hpbGQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6RGVmaW5pdGVTaXplU3RyYXRlZ3k6Om1pbkxvZ2ljYWxXaWR0aEZvckNoaWxkIGNvbnN0 KToKKyAgICAgICAgKiByZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmg6CisKIDIw MTctMDktMjEgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIElu c3BlY3Rvcjoga2V5Ym9hcmQgc2hvcnRjdXQgZm9yICJSZWxvYWQgcGFnZSBmcm9tIG9yaWdpbiIg ZG9lc24ndCBtYXRjaCBTYWZhcmksIGFuZCBkb2Vzbid0IHdvcmsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAKaW5kZXggM2Ez ZWI5NTgxOWZlOTdlZGMyOWVmZDM5YjY4MjhlODZjOTk3YTE5MC4uZGM4ODIwZjk2ZTIxYWQ3NmU1 YjU3YTkyMzA3NDFiZjhkZmJjMGY3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAKQEAgLTc0MiwxMSArNzQyLDYgQEAg TGF5b3V0VW5pdCBHcmlkVHJhY2tTaXppbmdBbGdvcml0aG1TdHJhdGVneTo6bWluQ29udGVudEZv ckNoaWxkKFJlbmRlckJveCYgY2hpbGQKIHsKICAgICBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24g Y2hpbGRJbmxpbmVEaXJlY3Rpb24gPSBmbG93QXdhcmVEaXJlY3Rpb25Gb3JDaGlsZChyZW5kZXJH cmlkKCksIGNoaWxkLCBGb3JDb2x1bW5zKTsKICAgICBpZiAoZGlyZWN0aW9uKCkgPT0gY2hpbGRJ bmxpbmVEaXJlY3Rpb24pIHsKLSAgICAgICAgLy8gSWYgfGNoaWxkfCBoYXMgYSByZWxhdGl2ZSBs b2dpY2FsIHdpZHRoLCB3ZSBzaG91bGRuJ3QgbGV0IGl0IG92ZXJyaWRlIGl0cyBpbnRyaW5zaWMg d2lkdGgsIHdoaWNoIGlzCi0gICAgICAgIC8vIHdoYXQgd2UgYXJlIGludGVyZXN0ZWQgaW4gaGVy ZS4gVGh1cyB3ZSBuZWVkIHRvIHNldCB0aGUgb3ZlcnJpZGUgbG9naWNhbCB3aWR0aCB0byBzdGQ6 Om51bGxvcHQgKG5vIHBvc3NpYmxlIHJlc29sdXRpb24pLgotICAgICAgICBpZiAoc2hvdWxkQ2xl YXJPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRTaXplRm9yQ2hpbGQoY2hpbGQsIEZvckNv bHVtbnMpKQotICAgICAgICAgICAgc2V0T3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6 ZUZvckNoaWxkKGNoaWxkLCBjaGlsZElubGluZURpcmVjdGlvbiwgc3RkOjpudWxsb3B0KTsKLQog ICAgICAgICAvLyBGSVhNRTogSXQncyB1bmNsZWFyIGlmIHdlIHNob3VsZCByZXR1cm4gdGhlIGlu dHJpbnNpYyB3aWR0aCBvciB0aGUgcHJlZmVycmVkIHdpZHRoLgogICAgICAgICAvLyBTZWUgaHR0 cDovL2xpc3RzLnczLm9yZy9BcmNoaXZlcy9QdWJsaWMvd3d3LXN0eWxlLzIwMTNKYW4vMDI0NS5o dG1sCiAgICAgICAgIExheW91dFVuaXQgbWFyZ2luTG9naWNhbFdpZHRoID0gY2hpbGQubmVlZHNM YXlvdXQoKSA/IGNvbXB1dGVNYXJnaW5Mb2dpY2FsU2l6ZUZvckNoaWxkKGNoaWxkSW5saW5lRGly ZWN0aW9uLCAqcmVuZGVyR3JpZCgpLCBjaGlsZCkgOiBjaGlsZC5tYXJnaW5Mb2dpY2FsV2lkdGgo KTsKQEAgLTc2MiwxMSArNzU3LDYgQEAgTGF5b3V0VW5pdCBHcmlkVHJhY2tTaXppbmdBbGdvcml0 aG1TdHJhdGVneTo6bWF4Q29udGVudEZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQKIHsKICAgICBH cmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gY2hpbGRJbmxpbmVEaXJlY3Rpb24gPSBmbG93QXdhcmVE aXJlY3Rpb25Gb3JDaGlsZChyZW5kZXJHcmlkKCksIGNoaWxkLCBGb3JDb2x1bW5zKTsKICAgICBp ZiAoZGlyZWN0aW9uKCkgPT0gY2hpbGRJbmxpbmVEaXJlY3Rpb24pIHsKLSAgICAgICAgLy8gSWYg fGNoaWxkfCBoYXMgYSByZWxhdGl2ZSBsb2dpY2FsIHdpZHRoLCB3ZSBzaG91bGRuJ3QgbGV0IGl0 IG92ZXJyaWRlIGl0cyBpbnRyaW5zaWMgd2lkdGgsIHdoaWNoIGlzCi0gICAgICAgIC8vIHdoYXQg d2UgYXJlIGludGVyZXN0ZWQgaW4gaGVyZS4gVGh1cyB3ZSBuZWVkIHRvIHNldCB0aGUgaW5saW5l LWF4aXMgb3ZlcnJpZGUgc2l6ZSB0byAtMSAobm8gcG9zc2libGUgcmVzb2x1dGlvbikuCi0gICAg ICAgIGlmIChzaG91bGRDbGVhck92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemVGb3JD aGlsZChjaGlsZCwgRm9yQ29sdW1ucykpCi0gICAgICAgICAgICBzZXRPdmVycmlkZUNvbnRhaW5p bmdCbG9ja0NvbnRlbnRTaXplRm9yQ2hpbGQoY2hpbGQsIGNoaWxkSW5saW5lRGlyZWN0aW9uLCBz dGQ6Om51bGxvcHQpOwotCiAgICAgICAgIC8vIEZJWE1FOiBJdCdzIHVuY2xlYXIgaWYgd2Ugc2hv dWxkIHJldHVybiB0aGUgaW50cmluc2ljIHdpZHRoIG9yIHRoZSBwcmVmZXJyZWQgd2lkdGguCiAg ICAgICAgIC8vIFNlZSBodHRwOi8vbGlzdHMudzMub3JnL0FyY2hpdmVzL1B1YmxpYy93d3ctc3R5 bGUvMjAxM0phbi8wMjQ1Lmh0bWwKICAgICAgICAgTGF5b3V0VW5pdCBtYXJnaW5Mb2dpY2FsV2lk dGggPSBjaGlsZC5uZWVkc0xheW91dCgpID8gY29tcHV0ZU1hcmdpbkxvZ2ljYWxTaXplRm9yQ2hp bGQoY2hpbGRJbmxpbmVEaXJlY3Rpb24sICpyZW5kZXJHcmlkKCksIGNoaWxkKSA6IGNoaWxkLm1h cmdpbkxvZ2ljYWxXaWR0aCgpOwpAQCAtNzg5LDE5ICs3NzksMjAgQEAgTGF5b3V0VW5pdCBHcmlk VHJhY2tTaXppbmdBbGdvcml0aG1TdHJhdGVneTo6bWluU2l6ZUZvckNoaWxkKFJlbmRlckJveCYg Y2hpbGQpIGMKICAgICBpZiAoIWNoaWxkU2l6ZS5pc0F1dG8oKSB8fCAoY2hpbGRNaW5TaXplLmlz QXV0bygpICYmIG92ZXJmbG93SXNWaXNpYmxlKSkKICAgICAgICAgcmV0dXJuIG1pbkNvbnRlbnRG b3JDaGlsZChjaGlsZCk7CiAKLSAgICBib29sIG92ZXJyaWRlU2l6ZUhhc0NoYW5nZWQgPSB1cGRh dGVPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRTaXplRm9yQ2hpbGQoY2hpbGQsIGNoaWxk SW5saW5lRGlyZWN0aW9uKTsKLQorICAgIExheW91dFVuaXQgZ3JpZEFyZWFTaXplID0gbV9hbGdv cml0aG0uZ3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQoY2hpbGQsIGNoaWxkSW5saW5lRGlyZWN0aW9u KTsKICAgICBpZiAoaXNSb3dBeGlzKQotICAgICAgICByZXR1cm4gbWluTG9naWNhbFdpZHRoRm9y Q2hpbGQoY2hpbGQsIGNoaWxkTWluU2l6ZSwgY2hpbGRJbmxpbmVEaXJlY3Rpb24pOworICAgICAg ICByZXR1cm4gbWluTG9naWNhbFdpZHRoRm9yQ2hpbGQoY2hpbGQsIGNoaWxkTWluU2l6ZSwgZ3Jp ZEFyZWFTaXplKTsKIAorICAgIGJvb2wgb3ZlcnJpZGVTaXplSGFzQ2hhbmdlZCA9IHVwZGF0ZU92 ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemVGb3JDaGlsZChjaGlsZCwgY2hpbGRJbmxp bmVEaXJlY3Rpb24sIGdyaWRBcmVhU2l6ZSk7CiAgICAgbGF5b3V0R3JpZEl0ZW1Gb3JNaW5TaXpl Q29tcHV0YXRpb24oY2hpbGQsIG92ZXJyaWRlU2l6ZUhhc0NoYW5nZWQpOwogCiAgICAgcmV0dXJu IGNoaWxkLmNvbXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgY2hpbGRNaW5TaXplLCBz dGQ6Om51bGxvcHQpLnZhbHVlX29yKDApICsgY2hpbGQubWFyZ2luTG9naWNhbEhlaWdodCgpICsg Y2hpbGQuc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpOwogfQogCi1ib29sIEdyaWRUcmFja1Npemlu Z0FsZ29yaXRobVN0cmF0ZWd5Ojp1cGRhdGVPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRT aXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRp cmVjdGlvbikgY29uc3QKK2Jvb2wgR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3k6OnVw ZGF0ZU92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemVGb3JDaGlsZChSZW5kZXJCb3gm IGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBzdGQ6Om9wdGlvbmFs PExheW91dFVuaXQ+IG92ZXJyaWRlU2l6ZSkgY29uc3QKIHsKLSAgICBMYXlvdXRVbml0IG92ZXJy aWRlU2l6ZSA9IG1fYWxnb3JpdGhtLmdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKGNoaWxkLCBkaXJl Y3Rpb24pOworICAgIGlmICghb3ZlcnJpZGVTaXplKQorICAgICAgICBvdmVycmlkZVNpemUgPSBt X2FsZ29yaXRobS5ncmlkQXJlYUJyZWFkdGhGb3JDaGlsZChjaGlsZCwgZGlyZWN0aW9uKTsKICAg ICBpZiAoaGFzT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6ZUZvckNoaWxkKGNoaWxk LCBkaXJlY3Rpb24pICYmIG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemVGb3JDaGls ZChjaGlsZCwgZGlyZWN0aW9uKSA9PSBvdmVycmlkZVNpemUpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIApAQCAtODE1LDE2ICs4MDYsMTYgQEAgcHVibGljOgogICAgICAgICA6IEdyaWRUcmFja1Np emluZ0FsZ29yaXRobVN0cmF0ZWd5KGFsZ29yaXRobSkgeyB9CiAKIHByaXZhdGU6Ci0gICAgTGF5 b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGhGb3JDaGlsZChSZW5kZXJCb3gmLCBMZW5ndGggY2hpbGRN aW5TaXplLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24pIGNvbnN0IG92ZXJyaWRlOworICAgIExh eW91dFVuaXQgbWluTG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiwgTGVuZ3RoIGNoaWxk TWluU2l6ZSwgTGF5b3V0VW5pdCBhdmFpbGFibGVTaXplKSBjb25zdCBvdmVycmlkZTsKICAgICB2 b2lkIGxheW91dEdyaWRJdGVtRm9yTWluU2l6ZUNvbXB1dGF0aW9uKFJlbmRlckJveCYsIGJvb2wg b3ZlcnJpZGVTaXplSGFzQ2hhbmdlZCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdm9pZCBtYXhpbWl6 ZVRyYWNrcyhWZWN0b3I8R3JpZFRyYWNrPiYsIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4mIGZy ZWVTcGFjZSkgb3ZlcnJpZGU7CiAgICAgZG91YmxlIGZpbmRVc2VkRmxleEZyYWN0aW9uKFZlY3Rv cjx1bnNpZ25lZD4mIGZsZXhpYmxlU2l6ZWRUcmFja3NJbmRleCwgR3JpZFRyYWNrU2l6aW5nRGly ZWN0aW9uLCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGZyZWVTcGFjZSkgY29uc3Qgb3ZlcnJp ZGU7CiAgICAgYm9vbCByZWNvbXB1dGVVc2VkRmxleEZyYWN0aW9uSWZOZWVkZWQoZG91YmxlJiBm bGV4RnJhY3Rpb24sIExheW91dFVuaXQmIHRvdGFsR3Jvd3RoKSBjb25zdCBvdmVycmlkZTsKIH07 CiAKLUxheW91dFVuaXQgSW5kZWZpbml0ZVNpemVTdHJhdGVneTo6bWluTG9naWNhbFdpZHRoRm9y Q2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNoaWxkTWluU2l6ZSwgR3JpZFRyYWNrU2l6 aW5nRGlyZWN0aW9uIGNoaWxkSW5saW5lRGlyZWN0aW9uKSBjb25zdAorTGF5b3V0VW5pdCBJbmRl ZmluaXRlU2l6ZVN0cmF0ZWd5OjptaW5Mb2dpY2FsV2lkdGhGb3JDaGlsZChSZW5kZXJCb3gmIGNo aWxkLCBMZW5ndGggY2hpbGRNaW5TaXplLCBMYXlvdXRVbml0IGF2YWlsYWJsZVNpemUpIGNvbnN0 CiB7Ci0gICAgcmV0dXJuIGNoaWxkLmNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvblVzaW5nKE1p blNpemUsIGNoaWxkTWluU2l6ZSwgb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6ZUZv ckNoaWxkKGNoaWxkLCBjaGlsZElubGluZURpcmVjdGlvbikudmFsdWVfb3IoMCksICpyZW5kZXJH cmlkKCksIG51bGxwdHIpICsgbWFyZ2luSW50cmluc2ljTG9naWNhbFdpZHRoRm9yQ2hpbGQocmVu ZGVyR3JpZCgpLCBjaGlsZCk7CisgICAgcmV0dXJuIGNoaWxkLmNvbXB1dGVMb2dpY2FsV2lkdGhJ blJlZ2lvblVzaW5nKE1pblNpemUsIGNoaWxkTWluU2l6ZSwgYXZhaWxhYmxlU2l6ZSwgKnJlbmRl ckdyaWQoKSwgbnVsbHB0cikgKyBtYXJnaW5JbnRyaW5zaWNMb2dpY2FsV2lkdGhGb3JDaGlsZChy ZW5kZXJHcmlkKCksIGNoaWxkKTsKIH0KIAogdm9pZCBJbmRlZmluaXRlU2l6ZVN0cmF0ZWd5Ojps YXlvdXRHcmlkSXRlbUZvck1pblNpemVDb21wdXRhdGlvbihSZW5kZXJCb3gmIGNoaWxkLCBib29s IG92ZXJyaWRlU2l6ZUhhc0NoYW5nZWQpIGNvbnN0CkBAIC05MTIsMTggKzkwMywxOCBAQCBwdWJs aWM6CiAgICAgICAgIDogR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3koYWxnb3JpdGht KSB7IH0KIAogcHJpdmF0ZToKLSAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aEZvckNoaWxk KFJlbmRlckJveCYsIExlbmd0aCBjaGlsZE1pblNpemUsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlv bikgY29uc3Qgb3ZlcnJpZGU7CisgICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGhGb3JDaGls ZChSZW5kZXJCb3gmLCBMZW5ndGggY2hpbGRNaW5TaXplLCBMYXlvdXRVbml0IGF2YWlsYWJsZVNp emUpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgbGF5b3V0R3JpZEl0ZW1Gb3JNaW5TaXplQ29t cHV0YXRpb24oUmVuZGVyQm94JiwgYm9vbCBvdmVycmlkZVNpemVIYXNDaGFuZ2VkKSBjb25zdCBv dmVycmlkZTsKICAgICB2b2lkIG1heGltaXplVHJhY2tzKFZlY3RvcjxHcmlkVHJhY2s+Jiwgc3Rk OjpvcHRpb25hbDxMYXlvdXRVbml0PiYgZnJlZVNwYWNlKSBvdmVycmlkZTsKICAgICBkb3VibGUg ZmluZFVzZWRGbGV4RnJhY3Rpb24oVmVjdG9yPHVuc2lnbmVkPiYgZmxleGlibGVTaXplZFRyYWNr c0luZGV4LCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5p dD4gZnJlZVNwYWNlKSBjb25zdCBvdmVycmlkZTsKICAgICBib29sIHJlY29tcHV0ZVVzZWRGbGV4 RnJhY3Rpb25JZk5lZWRlZChkb3VibGUmIGZsZXhGcmFjdGlvbiwgTGF5b3V0VW5pdCYgdG90YWxH cm93dGgpIGNvbnN0IG92ZXJyaWRlOwogfTsKIAotTGF5b3V0VW5pdCBEZWZpbml0ZVNpemVTdHJh dGVneTo6bWluTG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNo aWxkTWluU2l6ZSwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGNoaWxkSW5saW5lRGlyZWN0aW9u KSBjb25zdAorTGF5b3V0VW5pdCBEZWZpbml0ZVNpemVTdHJhdGVneTo6bWluTG9naWNhbFdpZHRo Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNoaWxkTWluU2l6ZSwgTGF5b3V0VW5p dCBhdmFpbGFibGVTaXplKSBjb25zdAogewogICAgIExheW91dFVuaXQgbWFyZ2luTG9naWNhbFdp ZHRoID0KLSAgICAgICAgY29tcHV0ZU1hcmdpbkxvZ2ljYWxTaXplRm9yQ2hpbGQoY2hpbGRJbmxp bmVEaXJlY3Rpb24sICpyZW5kZXJHcmlkKCksIGNoaWxkKTsKLSAgICByZXR1cm4gY2hpbGQuY29t cHV0ZUxvZ2ljYWxXaWR0aEluUmVnaW9uVXNpbmcoTWluU2l6ZSwgY2hpbGRNaW5TaXplLCBvdmVy cmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRTaXplRm9yQ2hpbGQoY2hpbGQsIGNoaWxkSW5saW5l RGlyZWN0aW9uKS52YWx1ZV9vcigwKSwgKnJlbmRlckdyaWQoKSwgbnVsbHB0cikgKyBtYXJnaW5M b2dpY2FsV2lkdGg7CisgICAgICAgIGNvbXB1dGVNYXJnaW5Mb2dpY2FsU2l6ZUZvckNoaWxkKGZs b3dBd2FyZURpcmVjdGlvbkZvckNoaWxkKHJlbmRlckdyaWQoKSwgY2hpbGQsIEZvckNvbHVtbnMp LCAqcmVuZGVyR3JpZCgpLCBjaGlsZCk7CisgICAgcmV0dXJuIGNoaWxkLmNvbXB1dGVMb2dpY2Fs V2lkdGhJblJlZ2lvblVzaW5nKE1pblNpemUsIGNoaWxkTWluU2l6ZSwgYXZhaWxhYmxlU2l6ZSwg KnJlbmRlckdyaWQoKSwgbnVsbHB0cikgKyBtYXJnaW5Mb2dpY2FsV2lkdGg7CiB9CiAKIHZvaWQg RGVmaW5pdGVTaXplU3RyYXRlZ3k6Om1heGltaXplVHJhY2tzKFZlY3RvcjxHcmlkVHJhY2s+JiB0 cmFja3MsIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4mIGZyZWVTcGFjZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uaAppbmRleCA1 YmZjMTBkNmRkNzY4NWJlNTY5Y2I1MGE1YjgzZjlmZGVmMzhmN2RhLi45NTA5OTA4YmRhNGZjZGU1 ZTY5YmQyYmQ0ZTY5YTg0MmM2ZWQ2ZmNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5oCkBAIC0yMjgsMTEgKzIyOCwxMSBAQCBw cm90ZWN0ZWQ6CiAgICAgR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3koR3JpZFRyYWNr U2l6aW5nQWxnb3JpdGhtJiBhbGdvcml0aG0pCiAgICAgICAgIDogbV9hbGdvcml0aG0oYWxnb3Jp dGhtKSB7IH0KIAotICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGhGb3JDaGls ZChSZW5kZXJCb3gmLCBMZW5ndGggY2hpbGRNaW5TaXplLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rp b24pIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgbWluTG9naWNhbFdpZHRoRm9y Q2hpbGQoUmVuZGVyQm94JiwgTGVuZ3RoIGNoaWxkTWluU2l6ZSwgTGF5b3V0VW5pdCBhdmFpbGFi bGVTaXplKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGxheW91dEdyaWRJdGVtRm9yTWlu U2l6ZUNvbXB1dGF0aW9uKFJlbmRlckJveCYsIGJvb2wgb3ZlcnJpZGVTaXplSGFzQ2hhbmdlZCkg Y29uc3QgPSAwOwogCiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0Rm9yQ2hpbGQoUmVuZGVy Qm94JikgY29uc3Q7Ci0gICAgYm9vbCB1cGRhdGVPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRl bnRTaXplRm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uKSBjb25z dDsKKyAgICBib29sIHVwZGF0ZU92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemVGb3JD aGlsZChSZW5kZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIHN0ZDo6b3B0aW9uYWw8 TGF5b3V0VW5pdD4gPSBzdGQ6Om51bGxvcHQpIGNvbnN0OwogCiAgICAgLy8gR3JpZFRyYWNrU2l6 aW5nQWxnb3JpdGhtIGFjY2Vzc29ycyBmb3Igc3ViY2xhc3Nlcy4KICAgICBMYXlvdXRVbml0IGNv bXB1dGVUcmFja0Jhc2VkU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fYWxnb3JpdGhtLmNvbXB1dGVU cmFja0Jhc2VkU2l6ZSgpOyB9Cg== 323881 2017-10-16 03:19:37 -0700 2017-10-25 09:03:02 -0700 Patch bug-178260-20171016121935.patch text/plain 10858 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjA0YjY1YzQyMWI5ZTBk YWFlODRiMjI4M2I3OWM2ZTUxNDRmNmEwMi4uOWUxNjhmNDRmYjg3OWQ0ODVlZGQ4NzZlNmU3ZTE5 M2M3ODE2ZWUxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTEwLTEzICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gQXZvaWQgY2xlYXJpbmcgdGhlIG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrV2lkdGggaWYgcG9z c2libGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 ODI2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNp bmNlIHRoZSBpbnRyaW5zaWMgd2lkdGggY29tcHV0YXRpb24gdXNlcyB0aGUgc2FtZSBsb2dpYyB0 aGFuIHRoZQorICAgICAgICB0cmFjayBzaXppbmcgYWxnb3JpdGhtIHdlIGFyZSBjbGVhcmluZyB0 aGUgb3ZlcnJpZGVDb250YWluaW5nQmxvY2tXaWR0aAorICAgICAgICBvZiBzb21lIGdyaWQgaXRl bXMgdGhhdCBhcmUgcmVxdWlyZWQgdG8gbGFpZCBvdXQgdGhlbSBwcm9wZXJseS4KKworICAgICAg ICBJdCdzIHZlcnkgdW5jb21tb24gdGhhdCBhbnkgaW50cmluc2ljIHNpemUgY29tcHV0YXRpb24g aXNuJ3QgcGVyZm9ybWVkCisgICAgICAgIGFzIHBhcnQgb2YgYSBsYXlvdXQgcHJvY2Vzcy4gSG93 ZXZlciwgaWYgaXQgaGFwcGVucywgb25jZSBjbGVhcmVkIHRoZQorICAgICAgICBvdmVycmlkZUNv bnRhaW5pbmdCbG9ja1dpZHRoIGl0IG1heSBsZWFkIHRvIGFuIGluY29ycmVjdCBsYXlvdXQgb2Yg dGhlCisgICAgICAgIGFmZmVjdGVkIGdyaWQgaXRlbXMuCisKKyAgICAgICAgVGhpcyBjaGFuZ2Vz IGlzIGEgZGVmZW5zaXZlIGFwcHJvYWNoIHRvIGF2b2lkIHRoZSBpc3N1ZXMgY2F1c2VkIGJ5Cisg ICAgICAgIHN1Y2ggb2ZmLWxheW91dCBwcmVmZXJyZWQgc2l6ZSByZXF1ZXN0cywgd2hpY2ggbWF5 IGltcGx5IHJlY29tcHV0aW5nCisgICAgICAgIHRoZSBncmlkIGNvbnRhaW5lciBpbnRyaW5zaWMg c2l6ZS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGJlY2F1c2Ugd2UgYXJlIG9ubHkgcmVtb3Zp bmcgc29tZSByZWR1bmRhbnQgbG9naWMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvR3JpZFRyYWNr U2l6aW5nQWxnb3JpdGhtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFja1NpemluZ0Fs Z29yaXRobVN0cmF0ZWd5OjptaW5Db250ZW50Rm9yQ2hpbGQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6R3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3k6Om1heENvbnRlbnRGb3JDaGls ZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmlkVHJhY2tTaXppbmdBbGdvcml0aG1TdHJh dGVneTo6bWluU2l6ZUZvckNoaWxkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkdyaWRUcmFj a1NpemluZ0FsZ29yaXRobVN0cmF0ZWd5Ojp1cGRhdGVPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0Nv bnRlbnRTaXplRm9yQ2hpbGQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5kZWZpbml0ZVNp emVTdHJhdGVneTo6bWluTG9naWNhbFdpZHRoRm9yQ2hpbGQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6RGVmaW5pdGVTaXplU3RyYXRlZ3k6Om1pbkxvZ2ljYWxXaWR0aEZvckNoaWxkIGNvbnN0 KToKKyAgICAgICAgKiByZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmg6CisKIDIw MTctMTAtMTMgIFJvbWFpbiBCZWxsZXNzb3J0ICA8cm9tYWluLmJlbGxlc3NvcnRAY3JmLmNhbm9u LmZyPgogCiAgICAgICAgIFtSZWFkYWJsZSBTdHJlYW1zIEFQSV0gQWxpZ24gcXVldWUgd2l0aCBz cGVjIGZvciBSZWFkYWJsZVN0cmVhbURlZmF1bHRDb250cm9sbGVyCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwCmluZGV4IDM5 MTQwMmY0MTliM2QyNjEyMDgxOTBiOTlhMjJiNDg5OTEzOWQyZTQuLjI5NjllZGU0YTdhN2NlODIw MDk1ZTdjNTJjZmJiMTU2MmE4ZjdkNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uY3BwCkBAIC03NDIsMTEgKzc0Miw2IEBA IExheW91dFVuaXQgR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3k6Om1pbkNvbnRlbnRG b3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkCiB7CiAgICAgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9u IGNoaWxkSW5saW5lRGlyZWN0aW9uID0gZmxvd0F3YXJlRGlyZWN0aW9uRm9yQ2hpbGQocmVuZGVy R3JpZCgpLCBjaGlsZCwgRm9yQ29sdW1ucyk7CiAgICAgaWYgKGRpcmVjdGlvbigpID09IGNoaWxk SW5saW5lRGlyZWN0aW9uKSB7Ci0gICAgICAgIC8vIElmIHxjaGlsZHwgaGFzIGEgcmVsYXRpdmUg bG9naWNhbCB3aWR0aCwgd2Ugc2hvdWxkbid0IGxldCBpdCBvdmVycmlkZSBpdHMgaW50cmluc2lj IHdpZHRoLCB3aGljaCBpcwotICAgICAgICAvLyB3aGF0IHdlIGFyZSBpbnRlcmVzdGVkIGluIGhl cmUuIFRodXMgd2UgbmVlZCB0byBzZXQgdGhlIG92ZXJyaWRlIGxvZ2ljYWwgd2lkdGggdG8gc3Rk OjpudWxsb3B0IChubyBwb3NzaWJsZSByZXNvbHV0aW9uKS4KLSAgICAgICAgaWYgKHNob3VsZENs ZWFyT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6ZUZvckNoaWxkKGNoaWxkLCBGb3JD b2x1bW5zKSkKLSAgICAgICAgICAgIHNldE92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudFNp emVGb3JDaGlsZChjaGlsZCwgY2hpbGRJbmxpbmVEaXJlY3Rpb24sIHN0ZDo6bnVsbG9wdCk7Ci0K ICAgICAgICAgLy8gRklYTUU6IEl0J3MgdW5jbGVhciBpZiB3ZSBzaG91bGQgcmV0dXJuIHRoZSBp bnRyaW5zaWMgd2lkdGggb3IgdGhlIHByZWZlcnJlZCB3aWR0aC4KICAgICAgICAgLy8gU2VlIGh0 dHA6Ly9saXN0cy53My5vcmcvQXJjaGl2ZXMvUHVibGljL3d3dy1zdHlsZS8yMDEzSmFuLzAyNDUu aHRtbAogICAgICAgICBMYXlvdXRVbml0IG1hcmdpbkxvZ2ljYWxXaWR0aCA9IGNoaWxkLm5lZWRz TGF5b3V0KCkgPyBjb21wdXRlTWFyZ2luTG9naWNhbFNpemVGb3JDaGlsZChjaGlsZElubGluZURp cmVjdGlvbiwgKnJlbmRlckdyaWQoKSwgY2hpbGQpIDogY2hpbGQubWFyZ2luTG9naWNhbFdpZHRo KCk7CkBAIC03NjIsMTEgKzc1Nyw2IEBAIExheW91dFVuaXQgR3JpZFRyYWNrU2l6aW5nQWxnb3Jp dGhtU3RyYXRlZ3k6Om1heENvbnRlbnRGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkCiB7CiAgICAg R3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGNoaWxkSW5saW5lRGlyZWN0aW9uID0gZmxvd0F3YXJl RGlyZWN0aW9uRm9yQ2hpbGQocmVuZGVyR3JpZCgpLCBjaGlsZCwgRm9yQ29sdW1ucyk7CiAgICAg aWYgKGRpcmVjdGlvbigpID09IGNoaWxkSW5saW5lRGlyZWN0aW9uKSB7Ci0gICAgICAgIC8vIElm IHxjaGlsZHwgaGFzIGEgcmVsYXRpdmUgbG9naWNhbCB3aWR0aCwgd2Ugc2hvdWxkbid0IGxldCBp dCBvdmVycmlkZSBpdHMgaW50cmluc2ljIHdpZHRoLCB3aGljaCBpcwotICAgICAgICAvLyB3aGF0 IHdlIGFyZSBpbnRlcmVzdGVkIGluIGhlcmUuIFRodXMgd2UgbmVlZCB0byBzZXQgdGhlIGlubGlu ZS1heGlzIG92ZXJyaWRlIHNpemUgdG8gLTEgKG5vIHBvc3NpYmxlIHJlc29sdXRpb24pLgotICAg ICAgICBpZiAoc2hvdWxkQ2xlYXJPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRTaXplRm9y Q2hpbGQoY2hpbGQsIEZvckNvbHVtbnMpKQotICAgICAgICAgICAgc2V0T3ZlcnJpZGVDb250YWlu aW5nQmxvY2tDb250ZW50U2l6ZUZvckNoaWxkKGNoaWxkLCBjaGlsZElubGluZURpcmVjdGlvbiwg c3RkOjpudWxsb3B0KTsKLQogICAgICAgICAvLyBGSVhNRTogSXQncyB1bmNsZWFyIGlmIHdlIHNo b3VsZCByZXR1cm4gdGhlIGludHJpbnNpYyB3aWR0aCBvciB0aGUgcHJlZmVycmVkIHdpZHRoLgog ICAgICAgICAvLyBTZWUgaHR0cDovL2xpc3RzLnczLm9yZy9BcmNoaXZlcy9QdWJsaWMvd3d3LXN0 eWxlLzIwMTNKYW4vMDI0NS5odG1sCiAgICAgICAgIExheW91dFVuaXQgbWFyZ2luTG9naWNhbFdp ZHRoID0gY2hpbGQubmVlZHNMYXlvdXQoKSA/IGNvbXB1dGVNYXJnaW5Mb2dpY2FsU2l6ZUZvckNo aWxkKGNoaWxkSW5saW5lRGlyZWN0aW9uLCAqcmVuZGVyR3JpZCgpLCBjaGlsZCkgOiBjaGlsZC5t YXJnaW5Mb2dpY2FsV2lkdGgoKTsKQEAgLTc4OSwxOSArNzc5LDIwIEBAIExheW91dFVuaXQgR3Jp ZFRyYWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3k6Om1pblNpemVGb3JDaGlsZChSZW5kZXJCb3gm IGNoaWxkKSBjCiAgICAgaWYgKCFjaGlsZFNpemUuaXNBdXRvKCkgfHwgKGNoaWxkTWluU2l6ZS5p c0F1dG8oKSAmJiBvdmVyZmxvd0lzVmlzaWJsZSkpCiAgICAgICAgIHJldHVybiBtaW5Db250ZW50 Rm9yQ2hpbGQoY2hpbGQpOwogCi0gICAgYm9vbCBvdmVycmlkZVNpemVIYXNDaGFuZ2VkID0gdXBk YXRlT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6ZUZvckNoaWxkKGNoaWxkLCBjaGls ZElubGluZURpcmVjdGlvbik7Ci0KKyAgICBMYXlvdXRVbml0IGdyaWRBcmVhU2l6ZSA9IG1fYWxn b3JpdGhtLmdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKGNoaWxkLCBjaGlsZElubGluZURpcmVjdGlv bik7CiAgICAgaWYgKGlzUm93QXhpcykKLSAgICAgICAgcmV0dXJuIG1pbkxvZ2ljYWxXaWR0aEZv ckNoaWxkKGNoaWxkLCBjaGlsZE1pblNpemUsIGNoaWxkSW5saW5lRGlyZWN0aW9uKTsKKyAgICAg ICAgcmV0dXJuIG1pbkxvZ2ljYWxXaWR0aEZvckNoaWxkKGNoaWxkLCBjaGlsZE1pblNpemUsIGdy aWRBcmVhU2l6ZSk7CiAKKyAgICBib29sIG92ZXJyaWRlU2l6ZUhhc0NoYW5nZWQgPSB1cGRhdGVP dmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRTaXplRm9yQ2hpbGQoY2hpbGQsIGNoaWxkSW5s aW5lRGlyZWN0aW9uLCBncmlkQXJlYVNpemUpOwogICAgIGxheW91dEdyaWRJdGVtRm9yTWluU2l6 ZUNvbXB1dGF0aW9uKGNoaWxkLCBvdmVycmlkZVNpemVIYXNDaGFuZ2VkKTsKIAogICAgIHJldHVy biBjaGlsZC5jb21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIGNoaWxkTWluU2l6ZSwg c3RkOjpudWxsb3B0KS52YWx1ZV9vcigwKSArIGNoaWxkLm1hcmdpbkxvZ2ljYWxIZWlnaHQoKSAr IGNoaWxkLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKTsKIH0KIAotYm9vbCBHcmlkVHJhY2tTaXpp bmdBbGdvcml0aG1TdHJhdGVneTo6dXBkYXRlT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50 U2l6ZUZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBk aXJlY3Rpb24pIGNvbnN0Citib29sIEdyaWRUcmFja1NpemluZ0FsZ29yaXRobVN0cmF0ZWd5Ojp1 cGRhdGVPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRTaXplRm9yQ2hpbGQoUmVuZGVyQm94 JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgc3RkOjpvcHRpb25h bDxMYXlvdXRVbml0PiBvdmVycmlkZVNpemUpIGNvbnN0CiB7Ci0gICAgTGF5b3V0VW5pdCBvdmVy cmlkZVNpemUgPSBtX2FsZ29yaXRobS5ncmlkQXJlYUJyZWFkdGhGb3JDaGlsZChjaGlsZCwgZGly ZWN0aW9uKTsKKyAgICBpZiAoIW92ZXJyaWRlU2l6ZSkKKyAgICAgICAgb3ZlcnJpZGVTaXplID0g bV9hbGdvcml0aG0uZ3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQoY2hpbGQsIGRpcmVjdGlvbik7CiAg ICAgaWYgKGhhc092ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemVGb3JDaGlsZChjaGls ZCwgZGlyZWN0aW9uKSAmJiBvdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRTaXplRm9yQ2hp bGQoY2hpbGQsIGRpcmVjdGlvbikgPT0gb3ZlcnJpZGVTaXplKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKQEAgLTgxNSwxNiArODA2LDE2IEBAIHB1YmxpYzoKICAgICAgICAgOiBHcmlkVHJhY2tT aXppbmdBbGdvcml0aG1TdHJhdGVneShhbGdvcml0aG0pIHsgfQogCiBwcml2YXRlOgotICAgIExh eW91dFVuaXQgbWluTG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiwgTGVuZ3RoIGNoaWxk TWluU2l6ZSwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uKSBjb25zdCBvdmVycmlkZTsKKyAgICBM YXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aEZvckNoaWxkKFJlbmRlckJveCYsIExlbmd0aCBjaGls ZE1pblNpemUsIExheW91dFVuaXQgYXZhaWxhYmxlU2l6ZSkgY29uc3Qgb3ZlcnJpZGU7CiAgICAg dm9pZCBsYXlvdXRHcmlkSXRlbUZvck1pblNpemVDb21wdXRhdGlvbihSZW5kZXJCb3gmLCBib29s IG92ZXJyaWRlU2l6ZUhhc0NoYW5nZWQpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgbWF4aW1p emVUcmFja3MoVmVjdG9yPEdyaWRUcmFjaz4mLCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+JiBm cmVlU3BhY2UpIG92ZXJyaWRlOwogICAgIGRvdWJsZSBmaW5kVXNlZEZsZXhGcmFjdGlvbihWZWN0 b3I8dW5zaWduZWQ+JiBmbGV4aWJsZVNpemVkVHJhY2tzSW5kZXgsIEdyaWRUcmFja1NpemluZ0Rp cmVjdGlvbiwgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBmcmVlU3BhY2UpIGNvbnN0IG92ZXJy aWRlOwogICAgIGJvb2wgcmVjb21wdXRlVXNlZEZsZXhGcmFjdGlvbklmTmVlZGVkKGRvdWJsZSYg ZmxleEZyYWN0aW9uLCBMYXlvdXRVbml0JiB0b3RhbEdyb3d0aCkgY29uc3Qgb3ZlcnJpZGU7CiB9 OwogCi1MYXlvdXRVbml0IEluZGVmaW5pdGVTaXplU3RyYXRlZ3k6Om1pbkxvZ2ljYWxXaWR0aEZv ckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIExlbmd0aCBjaGlsZE1pblNpemUsIEdyaWRUcmFja1Np emluZ0RpcmVjdGlvbiBjaGlsZElubGluZURpcmVjdGlvbikgY29uc3QKK0xheW91dFVuaXQgSW5k ZWZpbml0ZVNpemVTdHJhdGVneTo6bWluTG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiBj aGlsZCwgTGVuZ3RoIGNoaWxkTWluU2l6ZSwgTGF5b3V0VW5pdCBhdmFpbGFibGVTaXplKSBjb25z dAogewotICAgIHJldHVybiBjaGlsZC5jb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5n KE1pblNpemUsIGNoaWxkTWluU2l6ZSwgb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6 ZUZvckNoaWxkKGNoaWxkLCBjaGlsZElubGluZURpcmVjdGlvbikudmFsdWVfb3IoMCksICpyZW5k ZXJHcmlkKCksIG51bGxwdHIpICsgbWFyZ2luSW50cmluc2ljTG9naWNhbFdpZHRoRm9yQ2hpbGQo cmVuZGVyR3JpZCgpLCBjaGlsZCk7CisgICAgcmV0dXJuIGNoaWxkLmNvbXB1dGVMb2dpY2FsV2lk dGhJbkZyYWdtZW50VXNpbmcoTWluU2l6ZSwgY2hpbGRNaW5TaXplLCBhdmFpbGFibGVTaXplLCAq cmVuZGVyR3JpZCgpLCBudWxscHRyKSArIG1hcmdpbkludHJpbnNpY0xvZ2ljYWxXaWR0aEZvckNo aWxkKHJlbmRlckdyaWQoKSwgY2hpbGQpOwogfQogCiB2b2lkIEluZGVmaW5pdGVTaXplU3RyYXRl Z3k6OmxheW91dEdyaWRJdGVtRm9yTWluU2l6ZUNvbXB1dGF0aW9uKFJlbmRlckJveCYgY2hpbGQs IGJvb2wgb3ZlcnJpZGVTaXplSGFzQ2hhbmdlZCkgY29uc3QKQEAgLTkxMiwxOCArOTAzLDE4IEBA IHB1YmxpYzoKICAgICAgICAgOiBHcmlkVHJhY2tTaXppbmdBbGdvcml0aG1TdHJhdGVneShhbGdv cml0aG0pIHsgfQogCiBwcml2YXRlOgotICAgIExheW91dFVuaXQgbWluTG9naWNhbFdpZHRoRm9y Q2hpbGQoUmVuZGVyQm94JiwgTGVuZ3RoIGNoaWxkTWluU2l6ZSwgR3JpZFRyYWNrU2l6aW5nRGly ZWN0aW9uKSBjb25zdCBvdmVycmlkZTsKKyAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aEZv ckNoaWxkKFJlbmRlckJveCYsIExlbmd0aCBjaGlsZE1pblNpemUsIExheW91dFVuaXQgYXZhaWxh YmxlU2l6ZSkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdm9pZCBsYXlvdXRHcmlkSXRlbUZvck1pblNp emVDb21wdXRhdGlvbihSZW5kZXJCb3gmLCBib29sIG92ZXJyaWRlU2l6ZUhhc0NoYW5nZWQpIGNv bnN0IG92ZXJyaWRlOwogICAgIHZvaWQgbWF4aW1pemVUcmFja3MoVmVjdG9yPEdyaWRUcmFjaz4m LCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+JiBmcmVlU3BhY2UpIG92ZXJyaWRlOwogICAgIGRv dWJsZSBmaW5kVXNlZEZsZXhGcmFjdGlvbihWZWN0b3I8dW5zaWduZWQ+JiBmbGV4aWJsZVNpemVk VHJhY2tzSW5kZXgsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgc3RkOjpvcHRpb25hbDxMYXlv dXRVbml0PiBmcmVlU3BhY2UpIGNvbnN0IG92ZXJyaWRlOwogICAgIGJvb2wgcmVjb21wdXRlVXNl ZEZsZXhGcmFjdGlvbklmTmVlZGVkKGRvdWJsZSYgZmxleEZyYWN0aW9uLCBMYXlvdXRVbml0JiB0 b3RhbEdyb3d0aCkgY29uc3Qgb3ZlcnJpZGU7CiB9OwogCi1MYXlvdXRVbml0IERlZmluaXRlU2l6 ZVN0cmF0ZWd5OjptaW5Mb2dpY2FsV2lkdGhGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBMZW5n dGggY2hpbGRNaW5TaXplLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gY2hpbGRJbmxpbmVEaXJl Y3Rpb24pIGNvbnN0CitMYXlvdXRVbml0IERlZmluaXRlU2l6ZVN0cmF0ZWd5OjptaW5Mb2dpY2Fs V2lkdGhGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBMZW5ndGggY2hpbGRNaW5TaXplLCBMYXlv dXRVbml0IGF2YWlsYWJsZVNpemUpIGNvbnN0CiB7CiAgICAgTGF5b3V0VW5pdCBtYXJnaW5Mb2dp Y2FsV2lkdGggPQotICAgICAgICBjb21wdXRlTWFyZ2luTG9naWNhbFNpemVGb3JDaGlsZChjaGls ZElubGluZURpcmVjdGlvbiwgKnJlbmRlckdyaWQoKSwgY2hpbGQpOwotICAgIHJldHVybiBjaGls ZC5jb21wdXRlTG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1pblNpemUsIGNoaWxkTWluU2l6 ZSwgb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6ZUZvckNoaWxkKGNoaWxkLCBjaGls ZElubGluZURpcmVjdGlvbikudmFsdWVfb3IoMCksICpyZW5kZXJHcmlkKCksIG51bGxwdHIpICsg bWFyZ2luTG9naWNhbFdpZHRoOworICAgICAgICBjb21wdXRlTWFyZ2luTG9naWNhbFNpemVGb3JD aGlsZChmbG93QXdhcmVEaXJlY3Rpb25Gb3JDaGlsZChyZW5kZXJHcmlkKCksIGNoaWxkLCBGb3JD b2x1bW5zKSwgKnJlbmRlckdyaWQoKSwgY2hpbGQpOworICAgIHJldHVybiBjaGlsZC5jb21wdXRl TG9naWNhbFdpZHRoSW5GcmFnbWVudFVzaW5nKE1pblNpemUsIGNoaWxkTWluU2l6ZSwgYXZhaWxh YmxlU2l6ZSwgKnJlbmRlckdyaWQoKSwgbnVsbHB0cikgKyBtYXJnaW5Mb2dpY2FsV2lkdGg7CiB9 CiAKIHZvaWQgRGVmaW5pdGVTaXplU3RyYXRlZ3k6Om1heGltaXplVHJhY2tzKFZlY3RvcjxHcmlk VHJhY2s+JiB0cmFja3MsIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4mIGZyZWVTcGFjZSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0 aG0uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0u aAppbmRleCBlM2UzODRkZmYxYjQyMDg2N2IxYWNlMzEzY2I3ODY2ZmQ1Zjg5ZDlhLi5mNDM5NmNl ZTljODkzYzFmNWU3ZWEzNTkyMGYzNGZjN2E4YzgyZWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5oCkBAIC0yMjgsMTEgKzIy OCwxMSBAQCBwcm90ZWN0ZWQ6CiAgICAgR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3ko R3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtJiBhbGdvcml0aG0pCiAgICAgICAgIDogbV9hbGdvcml0 aG0oYWxnb3JpdGhtKSB7IH0KIAotICAgIHZpcnR1YWwgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lk dGhGb3JDaGlsZChSZW5kZXJCb3gmLCBMZW5ndGggY2hpbGRNaW5TaXplLCBHcmlkVHJhY2tTaXpp bmdEaXJlY3Rpb24pIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIExheW91dFVuaXQgbWluTG9naWNh bFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiwgTGVuZ3RoIGNoaWxkTWluU2l6ZSwgTGF5b3V0VW5p dCBhdmFpbGFibGVTaXplKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGxheW91dEdyaWRJ dGVtRm9yTWluU2l6ZUNvbXB1dGF0aW9uKFJlbmRlckJveCYsIGJvb2wgb3ZlcnJpZGVTaXplSGFz Q2hhbmdlZCkgY29uc3QgPSAwOwogCiAgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0Rm9yQ2hp bGQoUmVuZGVyQm94JikgY29uc3Q7Ci0gICAgYm9vbCB1cGRhdGVPdmVycmlkZUNvbnRhaW5pbmdC bG9ja0NvbnRlbnRTaXplRm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0 aW9uKSBjb25zdDsKKyAgICBib29sIHVwZGF0ZU92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVu dFNpemVGb3JDaGlsZChSZW5kZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIHN0ZDo6 b3B0aW9uYWw8TGF5b3V0VW5pdD4gPSBzdGQ6Om51bGxvcHQpIGNvbnN0OwogCiAgICAgLy8gR3Jp ZFRyYWNrU2l6aW5nQWxnb3JpdGhtIGFjY2Vzc29ycyBmb3Igc3ViY2xhc3Nlcy4KICAgICBMYXlv dXRVbml0IGNvbXB1dGVUcmFja0Jhc2VkU2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fYWxnb3JpdGht LmNvbXB1dGVUcmFja0Jhc2VkU2l6ZSgpOyB9Cg== 324829 2017-10-25 09:03:05 -0700 2017-10-25 09:38:18 -0700 Patch bug-178260-20171025180304.patch text/plain 10862 jfernandez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjA0YjY1YzQyMWI5ZTBk YWFlODRiMjI4M2I3OWM2ZTUxNDRmNmEwMi4uOTE3MDBjNDFhYzQ0M2M3YzkyM2FiZDViNDgyZTIz OTI2OGU2OGVkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTEwLTEzICBKYXZp ZXIgRmVybmFuZGV6ICA8amZlcm5hbmRlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gQXZvaWQgY2xlYXJpbmcgdGhlIG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrV2lkdGggaWYgcG9z c2libGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 ODI2MAorCisgICAgICAgIFJldmlld2VkIGJ5IFNlcmdpbyBWaWxsYXIgU2VuaW4uCisKKyAgICAg ICAgU2luY2UgdGhlIGludHJpbnNpYyB3aWR0aCBjb21wdXRhdGlvbiB1c2VzIHRoZSBzYW1lIGxv Z2ljIHRoYW4gdGhlCisgICAgICAgIHRyYWNrIHNpemluZyBhbGdvcml0aG0gd2UgYXJlIGNsZWFy aW5nIHRoZSBvdmVycmlkZUNvbnRhaW5pbmdCbG9ja1dpZHRoCisgICAgICAgIG9mIHNvbWUgZ3Jp ZCBpdGVtcyB0aGF0IGFyZSByZXF1aXJlZCB0byBsYWlkIG91dCB0aGVtIHByb3Blcmx5LgorCisg ICAgICAgIEl0J3MgdmVyeSB1bmNvbW1vbiB0aGF0IGFueSBpbnRyaW5zaWMgc2l6ZSBjb21wdXRh dGlvbiBpc24ndCBwZXJmb3JtZWQKKyAgICAgICAgYXMgcGFydCBvZiBhIGxheW91dCBwcm9jZXNz LiBIb3dldmVyLCBpZiBpdCBoYXBwZW5zLCBvbmNlIGNsZWFyZWQgdGhlCisgICAgICAgIG92ZXJy aWRlQ29udGFpbmluZ0Jsb2NrV2lkdGggaXQgbWF5IGxlYWQgdG8gYW4gaW5jb3JyZWN0IGxheW91 dCBvZiB0aGUKKyAgICAgICAgYWZmZWN0ZWQgZ3JpZCBpdGVtcy4KKworICAgICAgICBUaGlzIGNo YW5nZSBpcyBhIGRlZmVuc2l2ZSBhcHByb2FjaCB0byBhdm9pZCB0aGUgaXNzdWVzIGNhdXNlZCBi eQorICAgICAgICBzdWNoIG9mZi1sYXlvdXQgcHJlZmVycmVkIHNpemUgcmVxdWVzdHMsIHdoaWNo IG1heSBpbXBseSByZWNvbXB1dGluZworICAgICAgICB0aGUgZ3JpZCBjb250YWluZXIgaW50cmlu c2ljIHNpemUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBiZWNhdXNlIHdlIGFyZSBvbmx5IHJl bW92aW5nIHNvbWUgcmVkdW5kYW50IGxvZ2ljLgorCisgICAgICAgICogcmVuZGVyaW5nL0dyaWRU cmFja1NpemluZ0FsZ29yaXRobS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmlkVHJhY2tTaXpp bmdBbGdvcml0aG1TdHJhdGVneTo6bWluQ29udGVudEZvckNoaWxkIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkdyaWRUcmFja1NpemluZ0FsZ29yaXRobVN0cmF0ZWd5OjptYXhDb250ZW50Rm9y Q2hpbGQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6R3JpZFRyYWNrU2l6aW5nQWxnb3JpdGht U3RyYXRlZ3k6Om1pblNpemVGb3JDaGlsZCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpHcmlk VHJhY2tTaXppbmdBbGdvcml0aG1TdHJhdGVneTo6dXBkYXRlT3ZlcnJpZGVDb250YWluaW5nQmxv Y2tDb250ZW50U2l6ZUZvckNoaWxkIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkluZGVmaW5p dGVTaXplU3RyYXRlZ3k6Om1pbkxvZ2ljYWxXaWR0aEZvckNoaWxkIGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkRlZmluaXRlU2l6ZVN0cmF0ZWd5OjptaW5Mb2dpY2FsV2lkdGhGb3JDaGlsZCBj b25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5oOgor CiAyMDE3LTEwLTEzICBSb21haW4gQmVsbGVzc29ydCAgPHJvbWFpbi5iZWxsZXNzb3J0QGNyZi5j YW5vbi5mcj4KIAogICAgICAgICBbUmVhZGFibGUgU3RyZWFtcyBBUEldIEFsaWduIHF1ZXVlIHdp dGggc3BlYyBmb3IgUmVhZGFibGVTdHJlYW1EZWZhdWx0Q29udHJvbGxlcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcAppbmRl eCAzOTE0MDJmNDE5YjNkMjYxMjA4MTkwYjk5YTIyYjQ4OTkxMzlkMmU0Li4yOTY5ZWRlNGE3YTdj ZTgyMDA5NWU3YzUyY2ZiYjE1NjJhOGY3ZDc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtLmNwcApAQCAtNzQyLDExICs3NDIs NiBAQCBMYXlvdXRVbml0IEdyaWRUcmFja1NpemluZ0FsZ29yaXRobVN0cmF0ZWd5OjptaW5Db250 ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZAogewogICAgIEdyaWRUcmFja1NpemluZ0RpcmVj dGlvbiBjaGlsZElubGluZURpcmVjdGlvbiA9IGZsb3dBd2FyZURpcmVjdGlvbkZvckNoaWxkKHJl bmRlckdyaWQoKSwgY2hpbGQsIEZvckNvbHVtbnMpOwogICAgIGlmIChkaXJlY3Rpb24oKSA9PSBj aGlsZElubGluZURpcmVjdGlvbikgewotICAgICAgICAvLyBJZiB8Y2hpbGR8IGhhcyBhIHJlbGF0 aXZlIGxvZ2ljYWwgd2lkdGgsIHdlIHNob3VsZG4ndCBsZXQgaXQgb3ZlcnJpZGUgaXRzIGludHJp bnNpYyB3aWR0aCwgd2hpY2ggaXMKLSAgICAgICAgLy8gd2hhdCB3ZSBhcmUgaW50ZXJlc3RlZCBp biBoZXJlLiBUaHVzIHdlIG5lZWQgdG8gc2V0IHRoZSBvdmVycmlkZSBsb2dpY2FsIHdpZHRoIHRv IHN0ZDo6bnVsbG9wdCAobm8gcG9zc2libGUgcmVzb2x1dGlvbikuCi0gICAgICAgIGlmIChzaG91 bGRDbGVhck92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemVGb3JDaGlsZChjaGlsZCwg Rm9yQ29sdW1ucykpCi0gICAgICAgICAgICBzZXRPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRl bnRTaXplRm9yQ2hpbGQoY2hpbGQsIGNoaWxkSW5saW5lRGlyZWN0aW9uLCBzdGQ6Om51bGxvcHQp OwotCiAgICAgICAgIC8vIEZJWE1FOiBJdCdzIHVuY2xlYXIgaWYgd2Ugc2hvdWxkIHJldHVybiB0 aGUgaW50cmluc2ljIHdpZHRoIG9yIHRoZSBwcmVmZXJyZWQgd2lkdGguCiAgICAgICAgIC8vIFNl ZSBodHRwOi8vbGlzdHMudzMub3JnL0FyY2hpdmVzL1B1YmxpYy93d3ctc3R5bGUvMjAxM0phbi8w MjQ1Lmh0bWwKICAgICAgICAgTGF5b3V0VW5pdCBtYXJnaW5Mb2dpY2FsV2lkdGggPSBjaGlsZC5u ZWVkc0xheW91dCgpID8gY29tcHV0ZU1hcmdpbkxvZ2ljYWxTaXplRm9yQ2hpbGQoY2hpbGRJbmxp bmVEaXJlY3Rpb24sICpyZW5kZXJHcmlkKCksIGNoaWxkKSA6IGNoaWxkLm1hcmdpbkxvZ2ljYWxX aWR0aCgpOwpAQCAtNzYyLDExICs3NTcsNiBAQCBMYXlvdXRVbml0IEdyaWRUcmFja1NpemluZ0Fs Z29yaXRobVN0cmF0ZWd5OjptYXhDb250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZAogewog ICAgIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBjaGlsZElubGluZURpcmVjdGlvbiA9IGZsb3dB d2FyZURpcmVjdGlvbkZvckNoaWxkKHJlbmRlckdyaWQoKSwgY2hpbGQsIEZvckNvbHVtbnMpOwog ICAgIGlmIChkaXJlY3Rpb24oKSA9PSBjaGlsZElubGluZURpcmVjdGlvbikgewotICAgICAgICAv LyBJZiB8Y2hpbGR8IGhhcyBhIHJlbGF0aXZlIGxvZ2ljYWwgd2lkdGgsIHdlIHNob3VsZG4ndCBs ZXQgaXQgb3ZlcnJpZGUgaXRzIGludHJpbnNpYyB3aWR0aCwgd2hpY2ggaXMKLSAgICAgICAgLy8g d2hhdCB3ZSBhcmUgaW50ZXJlc3RlZCBpbiBoZXJlLiBUaHVzIHdlIG5lZWQgdG8gc2V0IHRoZSBp bmxpbmUtYXhpcyBvdmVycmlkZSBzaXplIHRvIC0xIChubyBwb3NzaWJsZSByZXNvbHV0aW9uKS4K LSAgICAgICAgaWYgKHNob3VsZENsZWFyT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6 ZUZvckNoaWxkKGNoaWxkLCBGb3JDb2x1bW5zKSkKLSAgICAgICAgICAgIHNldE92ZXJyaWRlQ29u dGFpbmluZ0Jsb2NrQ29udGVudFNpemVGb3JDaGlsZChjaGlsZCwgY2hpbGRJbmxpbmVEaXJlY3Rp b24sIHN0ZDo6bnVsbG9wdCk7Ci0KICAgICAgICAgLy8gRklYTUU6IEl0J3MgdW5jbGVhciBpZiB3 ZSBzaG91bGQgcmV0dXJuIHRoZSBpbnRyaW5zaWMgd2lkdGggb3IgdGhlIHByZWZlcnJlZCB3aWR0 aC4KICAgICAgICAgLy8gU2VlIGh0dHA6Ly9saXN0cy53My5vcmcvQXJjaGl2ZXMvUHVibGljL3d3 dy1zdHlsZS8yMDEzSmFuLzAyNDUuaHRtbAogICAgICAgICBMYXlvdXRVbml0IG1hcmdpbkxvZ2lj YWxXaWR0aCA9IGNoaWxkLm5lZWRzTGF5b3V0KCkgPyBjb21wdXRlTWFyZ2luTG9naWNhbFNpemVG b3JDaGlsZChjaGlsZElubGluZURpcmVjdGlvbiwgKnJlbmRlckdyaWQoKSwgY2hpbGQpIDogY2hp bGQubWFyZ2luTG9naWNhbFdpZHRoKCk7CkBAIC03ODksMTkgKzc3OSwyMCBAQCBMYXlvdXRVbml0 IEdyaWRUcmFja1NpemluZ0FsZ29yaXRobVN0cmF0ZWd5OjptaW5TaXplRm9yQ2hpbGQoUmVuZGVy Qm94JiBjaGlsZCkgYwogICAgIGlmICghY2hpbGRTaXplLmlzQXV0bygpIHx8IChjaGlsZE1pblNp emUuaXNBdXRvKCkgJiYgb3ZlcmZsb3dJc1Zpc2libGUpKQogICAgICAgICByZXR1cm4gbWluQ29u dGVudEZvckNoaWxkKGNoaWxkKTsKIAotICAgIGJvb2wgb3ZlcnJpZGVTaXplSGFzQ2hhbmdlZCA9 IHVwZGF0ZU92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemVGb3JDaGlsZChjaGlsZCwg Y2hpbGRJbmxpbmVEaXJlY3Rpb24pOwotCisgICAgTGF5b3V0VW5pdCBncmlkQXJlYVNpemUgPSBt X2FsZ29yaXRobS5ncmlkQXJlYUJyZWFkdGhGb3JDaGlsZChjaGlsZCwgY2hpbGRJbmxpbmVEaXJl Y3Rpb24pOwogICAgIGlmIChpc1Jvd0F4aXMpCi0gICAgICAgIHJldHVybiBtaW5Mb2dpY2FsV2lk dGhGb3JDaGlsZChjaGlsZCwgY2hpbGRNaW5TaXplLCBjaGlsZElubGluZURpcmVjdGlvbik7Cisg ICAgICAgIHJldHVybiBtaW5Mb2dpY2FsV2lkdGhGb3JDaGlsZChjaGlsZCwgY2hpbGRNaW5TaXpl LCBncmlkQXJlYVNpemUpOwogCisgICAgYm9vbCBvdmVycmlkZVNpemVIYXNDaGFuZ2VkID0gdXBk YXRlT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6ZUZvckNoaWxkKGNoaWxkLCBjaGls ZElubGluZURpcmVjdGlvbiwgZ3JpZEFyZWFTaXplKTsKICAgICBsYXlvdXRHcmlkSXRlbUZvck1p blNpemVDb21wdXRhdGlvbihjaGlsZCwgb3ZlcnJpZGVTaXplSGFzQ2hhbmdlZCk7CiAKICAgICBy ZXR1cm4gY2hpbGQuY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhNaW5TaXplLCBjaGlsZE1pblNp emUsIHN0ZDo6bnVsbG9wdCkudmFsdWVfb3IoMCkgKyBjaGlsZC5tYXJnaW5Mb2dpY2FsSGVpZ2h0 KCkgKyBjaGlsZC5zY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCk7CiB9CiAKLWJvb2wgR3JpZFRyYWNr U2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3k6OnVwZGF0ZU92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29u dGVudFNpemVGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rp b24gZGlyZWN0aW9uKSBjb25zdAorYm9vbCBHcmlkVHJhY2tTaXppbmdBbGdvcml0aG1TdHJhdGVn eTo6dXBkYXRlT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6ZUZvckNoaWxkKFJlbmRl ckJveCYgY2hpbGQsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIHN0ZDo6b3B0 aW9uYWw8TGF5b3V0VW5pdD4gb3ZlcnJpZGVTaXplKSBjb25zdAogewotICAgIExheW91dFVuaXQg b3ZlcnJpZGVTaXplID0gbV9hbGdvcml0aG0uZ3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQoY2hpbGQs IGRpcmVjdGlvbik7CisgICAgaWYgKCFvdmVycmlkZVNpemUpCisgICAgICAgIG92ZXJyaWRlU2l6 ZSA9IG1fYWxnb3JpdGhtLmdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKGNoaWxkLCBkaXJlY3Rpb24p OwogICAgIGlmIChoYXNPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRTaXplRm9yQ2hpbGQo Y2hpbGQsIGRpcmVjdGlvbikgJiYgb3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50U2l6ZUZv ckNoaWxkKGNoaWxkLCBkaXJlY3Rpb24pID09IG92ZXJyaWRlU2l6ZSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCkBAIC04MTUsMTYgKzgwNiwxNiBAQCBwdWJsaWM6CiAgICAgICAgIDogR3JpZFRy YWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3koYWxnb3JpdGhtKSB7IH0KIAogcHJpdmF0ZToKLSAg ICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0aEZvckNoaWxkKFJlbmRlckJveCYsIExlbmd0aCBj aGlsZE1pblNpemUsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbikgY29uc3Qgb3ZlcnJpZGU7Cisg ICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lkdGhGb3JDaGlsZChSZW5kZXJCb3gmLCBMZW5ndGgg Y2hpbGRNaW5TaXplLCBMYXlvdXRVbml0IGF2YWlsYWJsZVNpemUpIGNvbnN0IG92ZXJyaWRlOwog ICAgIHZvaWQgbGF5b3V0R3JpZEl0ZW1Gb3JNaW5TaXplQ29tcHV0YXRpb24oUmVuZGVyQm94Jiwg Ym9vbCBvdmVycmlkZVNpemVIYXNDaGFuZ2VkKSBjb25zdCBvdmVycmlkZTsKICAgICB2b2lkIG1h eGltaXplVHJhY2tzKFZlY3RvcjxHcmlkVHJhY2s+Jiwgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0 PiYgZnJlZVNwYWNlKSBvdmVycmlkZTsKICAgICBkb3VibGUgZmluZFVzZWRGbGV4RnJhY3Rpb24o VmVjdG9yPHVuc2lnbmVkPiYgZmxleGlibGVTaXplZFRyYWNrc0luZGV4LCBHcmlkVHJhY2tTaXpp bmdEaXJlY3Rpb24sIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gZnJlZVNwYWNlKSBjb25zdCBv dmVycmlkZTsKICAgICBib29sIHJlY29tcHV0ZVVzZWRGbGV4RnJhY3Rpb25JZk5lZWRlZChkb3Vi bGUmIGZsZXhGcmFjdGlvbiwgTGF5b3V0VW5pdCYgdG90YWxHcm93dGgpIGNvbnN0IG92ZXJyaWRl OwogfTsKIAotTGF5b3V0VW5pdCBJbmRlZmluaXRlU2l6ZVN0cmF0ZWd5OjptaW5Mb2dpY2FsV2lk dGhGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBMZW5ndGggY2hpbGRNaW5TaXplLCBHcmlkVHJh Y2tTaXppbmdEaXJlY3Rpb24gY2hpbGRJbmxpbmVEaXJlY3Rpb24pIGNvbnN0CitMYXlvdXRVbml0 IEluZGVmaW5pdGVTaXplU3RyYXRlZ3k6Om1pbkxvZ2ljYWxXaWR0aEZvckNoaWxkKFJlbmRlckJv eCYgY2hpbGQsIExlbmd0aCBjaGlsZE1pblNpemUsIExheW91dFVuaXQgYXZhaWxhYmxlU2l6ZSkg Y29uc3QKIHsKLSAgICByZXR1cm4gY2hpbGQuY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRV c2luZyhNaW5TaXplLCBjaGlsZE1pblNpemUsIG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVu dFNpemVGb3JDaGlsZChjaGlsZCwgY2hpbGRJbmxpbmVEaXJlY3Rpb24pLnZhbHVlX29yKDApLCAq cmVuZGVyR3JpZCgpLCBudWxscHRyKSArIG1hcmdpbkludHJpbnNpY0xvZ2ljYWxXaWR0aEZvckNo aWxkKHJlbmRlckdyaWQoKSwgY2hpbGQpOworICAgIHJldHVybiBjaGlsZC5jb21wdXRlTG9naWNh bFdpZHRoSW5GcmFnbWVudFVzaW5nKE1pblNpemUsIGNoaWxkTWluU2l6ZSwgYXZhaWxhYmxlU2l6 ZSwgKnJlbmRlckdyaWQoKSwgbnVsbHB0cikgKyBtYXJnaW5JbnRyaW5zaWNMb2dpY2FsV2lkdGhG b3JDaGlsZChyZW5kZXJHcmlkKCksIGNoaWxkKTsKIH0KIAogdm9pZCBJbmRlZmluaXRlU2l6ZVN0 cmF0ZWd5OjpsYXlvdXRHcmlkSXRlbUZvck1pblNpemVDb21wdXRhdGlvbihSZW5kZXJCb3gmIGNo aWxkLCBib29sIG92ZXJyaWRlU2l6ZUhhc0NoYW5nZWQpIGNvbnN0CkBAIC05MTIsMTggKzkwMywx OCBAQCBwdWJsaWM6CiAgICAgICAgIDogR3JpZFRyYWNrU2l6aW5nQWxnb3JpdGhtU3RyYXRlZ3ko YWxnb3JpdGhtKSB7IH0KIAogcHJpdmF0ZToKLSAgICBMYXlvdXRVbml0IG1pbkxvZ2ljYWxXaWR0 aEZvckNoaWxkKFJlbmRlckJveCYsIExlbmd0aCBjaGlsZE1pblNpemUsIEdyaWRUcmFja1Npemlu Z0RpcmVjdGlvbikgY29uc3Qgb3ZlcnJpZGU7CisgICAgTGF5b3V0VW5pdCBtaW5Mb2dpY2FsV2lk dGhGb3JDaGlsZChSZW5kZXJCb3gmLCBMZW5ndGggY2hpbGRNaW5TaXplLCBMYXlvdXRVbml0IGF2 YWlsYWJsZVNpemUpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgbGF5b3V0R3JpZEl0ZW1Gb3JN aW5TaXplQ29tcHV0YXRpb24oUmVuZGVyQm94JiwgYm9vbCBvdmVycmlkZVNpemVIYXNDaGFuZ2Vk KSBjb25zdCBvdmVycmlkZTsKICAgICB2b2lkIG1heGltaXplVHJhY2tzKFZlY3RvcjxHcmlkVHJh Y2s+Jiwgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiYgZnJlZVNwYWNlKSBvdmVycmlkZTsKICAg ICBkb3VibGUgZmluZFVzZWRGbGV4RnJhY3Rpb24oVmVjdG9yPHVuc2lnbmVkPiYgZmxleGlibGVT aXplZFRyYWNrc0luZGV4LCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIHN0ZDo6b3B0aW9uYWw8 TGF5b3V0VW5pdD4gZnJlZVNwYWNlKSBjb25zdCBvdmVycmlkZTsKICAgICBib29sIHJlY29tcHV0 ZVVzZWRGbGV4RnJhY3Rpb25JZk5lZWRlZChkb3VibGUmIGZsZXhGcmFjdGlvbiwgTGF5b3V0VW5p dCYgdG90YWxHcm93dGgpIGNvbnN0IG92ZXJyaWRlOwogfTsKIAotTGF5b3V0VW5pdCBEZWZpbml0 ZVNpemVTdHJhdGVneTo6bWluTG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwg TGVuZ3RoIGNoaWxkTWluU2l6ZSwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGNoaWxkSW5saW5l RGlyZWN0aW9uKSBjb25zdAorTGF5b3V0VW5pdCBEZWZpbml0ZVNpemVTdHJhdGVneTo6bWluTG9n aWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgTGVuZ3RoIGNoaWxkTWluU2l6ZSwg TGF5b3V0VW5pdCBhdmFpbGFibGVTaXplKSBjb25zdAogewogICAgIExheW91dFVuaXQgbWFyZ2lu TG9naWNhbFdpZHRoID0KLSAgICAgICAgY29tcHV0ZU1hcmdpbkxvZ2ljYWxTaXplRm9yQ2hpbGQo Y2hpbGRJbmxpbmVEaXJlY3Rpb24sICpyZW5kZXJHcmlkKCksIGNoaWxkKTsKLSAgICByZXR1cm4g Y2hpbGQuY29tcHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBjaGlsZE1p blNpemUsIG92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudFNpemVGb3JDaGlsZChjaGlsZCwg Y2hpbGRJbmxpbmVEaXJlY3Rpb24pLnZhbHVlX29yKDApLCAqcmVuZGVyR3JpZCgpLCBudWxscHRy KSArIG1hcmdpbkxvZ2ljYWxXaWR0aDsKKyAgICAgICAgY29tcHV0ZU1hcmdpbkxvZ2ljYWxTaXpl Rm9yQ2hpbGQoZmxvd0F3YXJlRGlyZWN0aW9uRm9yQ2hpbGQocmVuZGVyR3JpZCgpLCBjaGlsZCwg Rm9yQ29sdW1ucyksICpyZW5kZXJHcmlkKCksIGNoaWxkKTsKKyAgICByZXR1cm4gY2hpbGQuY29t cHV0ZUxvZ2ljYWxXaWR0aEluRnJhZ21lbnRVc2luZyhNaW5TaXplLCBjaGlsZE1pblNpemUsIGF2 YWlsYWJsZVNpemUsICpyZW5kZXJHcmlkKCksIG51bGxwdHIpICsgbWFyZ2luTG9naWNhbFdpZHRo OwogfQogCiB2b2lkIERlZmluaXRlU2l6ZVN0cmF0ZWd5OjptYXhpbWl6ZVRyYWNrcyhWZWN0b3I8 R3JpZFRyYWNrPiYgdHJhY2tzLCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+JiBmcmVlU3BhY2Up CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxn b3JpdGhtLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvR3JpZFRyYWNrU2l6aW5nQWxnb3Jp dGhtLmgKaW5kZXggZTNlMzg0ZGZmMWI0MjA4NjdiMWFjZTMxM2NiNzg2NmZkNWY4OWQ5YS4uZjQz OTZjZWU5Yzg5M2MxZjVlN2VhMzU5MjBmMzRmYzdhOGM4MmViYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0dyaWRUcmFja1NpemluZ0FsZ29yaXRobS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9HcmlkVHJhY2tTaXppbmdBbGdvcml0aG0uaApAQCAtMjI4LDEx ICsyMjgsMTEgQEAgcHJvdGVjdGVkOgogICAgIEdyaWRUcmFja1NpemluZ0FsZ29yaXRobVN0cmF0 ZWd5KEdyaWRUcmFja1NpemluZ0FsZ29yaXRobSYgYWxnb3JpdGhtKQogICAgICAgICA6IG1fYWxn b3JpdGhtKGFsZ29yaXRobSkgeyB9CiAKLSAgICB2aXJ0dWFsIExheW91dFVuaXQgbWluTG9naWNh bFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiwgTGVuZ3RoIGNoaWxkTWluU2l6ZSwgR3JpZFRyYWNr U2l6aW5nRGlyZWN0aW9uKSBjb25zdCA9IDA7CisgICAgdmlydHVhbCBMYXlvdXRVbml0IG1pbkxv Z2ljYWxXaWR0aEZvckNoaWxkKFJlbmRlckJveCYsIExlbmd0aCBjaGlsZE1pblNpemUsIExheW91 dFVuaXQgYXZhaWxhYmxlU2l6ZSkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBsYXlvdXRH cmlkSXRlbUZvck1pblNpemVDb21wdXRhdGlvbihSZW5kZXJCb3gmLCBib29sIG92ZXJyaWRlU2l6 ZUhhc0NoYW5nZWQpIGNvbnN0ID0gMDsKIAogICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodEZv ckNoaWxkKFJlbmRlckJveCYpIGNvbnN0OwotICAgIGJvb2wgdXBkYXRlT3ZlcnJpZGVDb250YWlu aW5nQmxvY2tDb250ZW50U2l6ZUZvckNoaWxkKFJlbmRlckJveCYsIEdyaWRUcmFja1NpemluZ0Rp cmVjdGlvbikgY29uc3Q7CisgICAgYm9vbCB1cGRhdGVPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0Nv bnRlbnRTaXplRm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBz dGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+ID0gc3RkOjpudWxsb3B0KSBjb25zdDsKIAogICAgIC8v IEdyaWRUcmFja1NpemluZ0FsZ29yaXRobSBhY2Nlc3NvcnMgZm9yIHN1YmNsYXNzZXMuCiAgICAg TGF5b3V0VW5pdCBjb21wdXRlVHJhY2tCYXNlZFNpemUoKSBjb25zdCB7IHJldHVybiBtX2FsZ29y aXRobS5jb21wdXRlVHJhY2tCYXNlZFNpemUoKTsgfQo=