159716 2016-07-13 08:40:03 -0700 [css-grid] Const-ify track sizing algorithm 2016-07-14 01:37:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 svillar svillar cgarcia commit-queue darin esprehn+autocc glenn jfernandez kling koivisto kondapallykalyan rego svillar oldest_to_newest 1210447 0 svillar 2016-07-13 08:40:03 -0700 [css-grid] Const-ify track sizing algorithm 1210450 1 283529 svillar 2016-07-13 08:45:21 -0700 Created attachment 283529 Patch 1210459 2 283532 svillar 2016-07-13 09:03:31 -0700 Created attachment 283532 Patch 1210464 3 283533 svillar 2016-07-13 09:10:16 -0700 Created attachment 283533 Patch 1210932 4 283533 commit-queue 2016-07-14 01:36:58 -0700 Comment on attachment 283533 Patch Clearing flags on attachment: 283533 Committed r203220: <http://trac.webkit.org/changeset/203220> 1210933 5 commit-queue 2016-07-14 01:37:02 -0700 All reviewed patches have been landed. Closing bug. 283529 2016-07-13 08:45:21 -0700 2016-07-13 09:03:24 -0700 Patch bug-159716-20160713174419.patch text/plain 14150 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxOTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTE1MGI3MGI4ZmE0Y2Jm YjljYTA5NTgyYzkyNWQ1MDlhNzE1M2MwZS4uZGQyNWQ4NTZhMTc0MWFlY2M0NzRlNDU2NDc0NTIw ODdmN2RjMGE1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTA3LTEzICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gQ29uc3QtaWZ5IHRyYWNrIHNpemluZyBhbGdvcml0aG0KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbCB0aGUgbWV0aG9kcyB1c2VkIHRvIHJ1biB0 aGUgdHJhY2sgc2l6aW5nIGFsZ29yaXRobSBzaG91bGQgbm90CisgICAgICAgIG1vZGlmeSB0aGUg c3RhdGUgb2YgTGF5b3V0R3JpZC4gV2UgY2FuIHNhZmVseSBjb25zdC1pZnkgYWxsIG9mIHRoZW0K KyAgICAgICAgYW5kIHJlbW92ZSB0aGUgdWdseSBjb25zdF9jYXN0IGluIGNvbXB1dGVJbnRyaW5z aWNMb2dpY2FsV2lkdGhzKCkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZCBhcyB0aGVy ZSBpcyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy R3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpsb2dpY2FsSGVpZ2h0Rm9y Q2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6bWluU2l6ZUZvckNoaWxkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OnVwZGF0ZU92ZXJyaWRlQ29udGFpbmluZ0Js b2NrQ29udGVudExvZ2ljYWxXaWR0aEZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckdyaWQ6Om1pbkNvbnRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlk OjptYXhDb250ZW50Rm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6cmVz b2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckdyaWQ6OnJlc29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvck5v blNwYW5uaW5nSXRlbXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y3VycmVudEl0 ZW1TaXplRm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnNGb3JJdGVt cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpkaXN0cmlidXRlU3BhY2VUb1RyYWNr cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuaDoKKwogMjAxNi0wNi0wOCAgU2Vy Z2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLWdy aWRdIENSQVNIIHdoZW4gZ2V0dGluZyB0aGUgY29tcHV0ZWQgc3R5bGUgb2YgYSBncmlkIHdpdGgg b25seSBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgY2hpbGRyZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJHcmlkLmNwcAppbmRleCBjZWI5MjRmMWFjYjI1MWY1ZjBjMzFjZTg4ZjEzZDY5Nzgz N2VhZmQ5Li45MmMxY2Y0ODYzNGIxOTE2Mzc5OWEzN2QwZWFkNzM5OWEwZDlmNjg5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwCkBAIC00NjYsNyArNDY2LDcgQEAgdm9p ZCBSZW5kZXJHcmlkOjpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBt aW5Mb2dpY2FsV2lkdGgsIExheW8KICAgICBHcmlkU2l6aW5nRGF0YSBzaXppbmdEYXRhKGdyaWRD b2x1bW5Db3VudCgpLCBncmlkUm93Q291bnQoKSk7CiAgICAgc2l6aW5nRGF0YS5zZXRGcmVlU3Bh Y2VGb3JEaXJlY3Rpb24oRm9yQ29sdW1ucywgTnVsbG9wdCk7CiAgICAgc2l6aW5nRGF0YS5zaXpp bmdPcGVyYXRpb24gPSBHcmlkU2l6aW5nRGF0YTo6SW50cmluc2ljU2l6ZUNvbXB1dGF0aW9uOwot ICAgIGNvbnN0X2Nhc3Q8UmVuZGVyR3JpZCo+KHRoaXMpLT5jb21wdXRlVXNlZEJyZWFkdGhPZkdy aWRUcmFja3MoRm9yQ29sdW1ucywgc2l6aW5nRGF0YSwgbWluTG9naWNhbFdpZHRoLCBtYXhMb2dp Y2FsV2lkdGgpOworICAgIGNvbXB1dGVVc2VkQnJlYWR0aE9mR3JpZFRyYWNrcyhGb3JDb2x1bW5z LCBzaXppbmdEYXRhLCBtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CiAKICAgICBM YXlvdXRVbml0IHRvdGFsR3V0dGVyc1NpemUgPSBndXR0ZXJzU2l6ZShGb3JDb2x1bW5zLCBzaXpp bmdEYXRhLmNvbHVtblRyYWNrcy5zaXplKCkpOwogICAgIG1pbkxvZ2ljYWxXaWR0aCArPSB0b3Rh bEd1dHRlcnNTaXplOwpAQCAtNTMxLDcgKzUzMSw3IEBAIHN0YXRpYyBpbmxpbmUgZG91YmxlIG5v cm1hbGl6ZWRGbGV4RnJhY3Rpb24oY29uc3QgR3JpZFRyYWNrJiB0cmFjaywgZG91YmxlIGZsZXhG CiAgICAgcmV0dXJuIHRyYWNrLmJhc2VTaXplKCkgLyBzdGQ6Om1heDxkb3VibGU+KDEsIGZsZXhG YWN0b3IpOwogfQogCi12b2lkIFJlbmRlckdyaWQ6OmNvbXB1dGVVc2VkQnJlYWR0aE9mR3JpZFRy YWNrcyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYg c2l6aW5nRGF0YSwgTGF5b3V0VW5pdCYgYmFzZVNpemVzV2l0aG91dE1heGltaXphdGlvbiwgTGF5 b3V0VW5pdCYgZ3Jvd3RoTGltaXRzV2l0aG91dE1heGltaXphdGlvbikKK3ZvaWQgUmVuZGVyR3Jp ZDo6Y29tcHV0ZVVzZWRCcmVhZHRoT2ZHcmlkVHJhY2tzKEdyaWRUcmFja1NpemluZ0RpcmVjdGlv biBkaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhLCBMYXlvdXRVbml0JiBiYXNl U2l6ZXNXaXRob3V0TWF4aW1pemF0aW9uLCBMYXlvdXRVbml0JiBncm93dGhMaW1pdHNXaXRob3V0 TWF4aW1pemF0aW9uKSBjb25zdAogewogICAgIGNvbnN0IE9wdGlvbmFsPExheW91dFVuaXQ+IGlu aXRpYWxGcmVlU3BhY2UgPSBzaXppbmdEYXRhLmZyZWVTcGFjZUZvckRpcmVjdGlvbihkaXJlY3Rp b24pOwogICAgIFZlY3RvcjxHcmlkVHJhY2s+JiB0cmFja3MgPSAoZGlyZWN0aW9uID09IEZvckNv bHVtbnMpID8gc2l6aW5nRGF0YS5jb2x1bW5UcmFja3MgOiBzaXppbmdEYXRhLnJvd1RyYWNrczsK QEAgLTc4MSw3ICs3ODEsNyBAQCBHcmlkVHJhY2tTaXplIFJlbmRlckdyaWQ6OmdyaWRUcmFja1Np emUoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgdW5zaQogICAgIHJldHVybiBH cmlkVHJhY2tTaXplKG1pblRyYWNrQnJlYWR0aCwgbWF4VHJhY2tCcmVhZHRoKTsKIH0KIAotTGF5 b3V0VW5pdCBSZW5kZXJHcmlkOjpsb2dpY2FsSGVpZ2h0Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGls ZCwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpCitMYXlvdXRVbml0IFJlbmRlckdyaWQ6Omxv Z2ljYWxIZWlnaHRGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBHcmlkU2l6aW5nRGF0YSYgc2l6 aW5nRGF0YSkgY29uc3QKIHsKICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBvbGRPdmVycmlkZUNv bnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGggPSBjaGlsZC5oYXNPdmVycmlkZUNvbnRh aW5pbmdCbG9ja0xvZ2ljYWxXaWR0aCgpID8gY2hpbGQub3ZlcnJpZGVDb250YWluaW5nQmxvY2tD b250ZW50TG9naWNhbFdpZHRoKCkgOiBMYXlvdXRVbml0KCk7CiAgICAgTGF5b3V0VW5pdCBvdmVy cmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGggPSBncmlkQXJlYUJyZWFkdGhG b3JDaGlsZChjaGlsZCwgRm9yQ29sdW1ucywgc2l6aW5nRGF0YS5jb2x1bW5UcmFja3MpOwpAQCAt ODAxLDcgKzgwMSw3IEBAIExheW91dFVuaXQgUmVuZGVyR3JpZDo6bG9naWNhbEhlaWdodEZvckNo aWxkKFJlbmRlckJveCYgY2hpbGQsIEdyaWRTaXppbmdEYXRhJiBzCiAgICAgcmV0dXJuIGNoaWxk LmxvZ2ljYWxIZWlnaHQoKSArIGNoaWxkLm1hcmdpbkxvZ2ljYWxIZWlnaHQoKTsKIH0KIAotTGF5 b3V0VW5pdCBSZW5kZXJHcmlkOjptaW5TaXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3Jp ZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0Rh dGEpCitMYXlvdXRVbml0IFJlbmRlckdyaWQ6Om1pblNpemVGb3JDaGlsZChSZW5kZXJCb3gmIGNo aWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYg c2l6aW5nRGF0YSkgY29uc3QKIHsKICAgICBib29sIGhhc09ydGhvZ29uYWxXcml0aW5nTW9kZSA9 IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgIT0gaXNIb3Jpem9udGFsV3JpdGluZ01v ZGUoKTsKICAgICAvLyBGSVhNRTogUHJvcGVybHkgc3VwcG9ydCBvcnRob2dvbmFsIHdyaXRpbmcg bW9kZS4KQEAgLTgyNiw3ICs4MjYsNyBAQCBMYXlvdXRVbml0IFJlbmRlckdyaWQ6Om1pblNpemVG b3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3RpbwogICAgIHJl dHVybiBjaGlsZC5jb21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIGNoaWxkTWluU2l6 ZSwgTnVsbG9wdCkudmFsdWVPcigwKSArIGNoaWxkLm1hcmdpbkxvZ2ljYWxIZWlnaHQoKSArIGNo aWxkLnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKTsKIH0KIAotYm9vbCBSZW5kZXJHcmlkOjp1cGRh dGVPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGhGb3JDaGlsZChSZW5k ZXJCb3gmIGNoaWxkLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkKK2Jvb2wgUmVuZGVyR3Jp ZDo6dXBkYXRlT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoRm9yQ2hp bGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpIGNvbnN0CiB7 CiAgICAgTGF5b3V0VW5pdCBvdmVycmlkZVdpZHRoID0gZ3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQo Y2hpbGQsIEZvckNvbHVtbnMsIHNpemluZ0RhdGEuY29sdW1uVHJhY2tzKTsKICAgICBpZiAoY2hp bGQuaGFzT3ZlcnJpZGVDb250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGgoKSAmJiBjaGlsZC5vdmVy cmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGgoKSA9PSBvdmVycmlkZVdpZHRo KQpAQCAtODM2LDcgKzgzNiw3IEBAIGJvb2wgUmVuZGVyR3JpZDo6dXBkYXRlT3ZlcnJpZGVDb250 YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVyCiAgICAgcmV0dXJu IHRydWU7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyR3JpZDo6bWluQ29udGVudEZvckNoaWxkKFJl bmRlckJveCYgY2hpbGQsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIEdyaWRT aXppbmdEYXRhJiBzaXppbmdEYXRhKQorTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjptaW5Db250ZW50 Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVj dGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpIGNvbnN0CiB7CiAgICAgYm9vbCBoYXNP cnRob2dvbmFsV3JpdGluZ01vZGUgPSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICE9 IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CiAgICAgLy8gRklYTUU6IFByb3Blcmx5IHN1cHBv cnQgb3J0aG9nb25hbCB3cml0aW5nIG1vZGUuCkBAIC04NTksNyArODU5LDcgQEAgTGF5b3V0VW5p dCBSZW5kZXJHcmlkOjptaW5Db250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFRy YWNrU2l6aW5nRGlyZWMKICAgICByZXR1cm4gbG9naWNhbEhlaWdodEZvckNoaWxkKGNoaWxkLCBz aXppbmdEYXRhKTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjptYXhDb250ZW50Rm9yQ2hp bGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwg R3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpCitMYXlvdXRVbml0IFJlbmRlckdyaWQ6Om1heENv bnRlbnRGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24g ZGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkgY29uc3QKIHsKICAgICBib29s IGhhc09ydGhvZ29uYWxXcml0aW5nTW9kZSA9IGNoaWxkLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl KCkgIT0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKICAgICAvLyBGSVhNRTogUHJvcGVybHkg c3VwcG9ydCBvcnRob2dvbmFsIHdyaXRpbmcgbW9kZS4KQEAgLTkxOSw3ICs5MTksNyBAQCBzdHJ1 Y3QgR3JpZEl0ZW1zU3Bhbkdyb3VwUmFuZ2UgewogICAgIFZlY3RvcjxHcmlkSXRlbVdpdGhTcGFu Pjo6aXRlcmF0b3IgcmFuZ2VFbmQ7CiB9OwogCi12b2lkIFJlbmRlckdyaWQ6OnJlc29sdmVDb250 ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9ucyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGly ZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkKK3ZvaWQgUmVuZGVyR3JpZDo6cmVz b2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zKEdyaWRUcmFja1NpemluZ0RpcmVj dGlvbiBkaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKSBjb25zdAogewogICAg IHNpemluZ0RhdGEuaXRlbXNTb3J0ZWRCeUluY3JlYXNpbmdTcGFuLnNocmluaygwKTsKICAgICBI YXNoU2V0PFJlbmRlckJveCo+IGl0ZW1zU2V0OwpAQCAtOTYwLDcgKzk2MCw3IEBAIHZvaWQgUmVu ZGVyR3JpZDo6cmVzb2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zKEdyaWRUcmFj a1NpemluZ0RpcmVjdGlvCiAgICAgfQogfQogCi12b2lkIFJlbmRlckdyaWQ6OnJlc29sdmVDb250 ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvck5vblNwYW5uaW5nSXRlbXMoR3JpZFRyYWNr U2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgY29uc3QgR3JpZFNwYW4mIHNwYW4sIFJlbmRlckJv eCYgZ3JpZEl0ZW0sIEdyaWRUcmFjayYgdHJhY2ssIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRh KQordm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlv bnNGb3JOb25TcGFubmluZ0l0ZW1zKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24s IGNvbnN0IEdyaWRTcGFuJiBzcGFuLCBSZW5kZXJCb3gmIGdyaWRJdGVtLCBHcmlkVHJhY2smIHRy YWNrLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkgY29uc3QKIHsKICAgICB1bnNpZ25lZCB0 cmFja1Bvc2l0aW9uID0gc3Bhbi5zdGFydExpbmUoKTsKICAgICBHcmlkVHJhY2tTaXplIHRyYWNr U2l6ZSA9IGdyaWRUcmFja1NpemUoZGlyZWN0aW9uLCB0cmFja1Bvc2l0aW9uKTsKQEAgLTEwODAs NyArMTA4MCw3IEBAIHZvaWQgUmVuZGVyR3JpZDo6dXBkYXRlVHJhY2tTaXplRm9yVHJhY2tTaXpl Q29tcHV0YXRpb25QaGFzZShUcmFja1NpemVDb21wdXRhdGlvCiAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyR3JpZDo6Y3VycmVudEl0ZW1TaXplRm9yVHJh Y2tTaXplQ29tcHV0YXRpb25QaGFzZShUcmFja1NpemVDb21wdXRhdGlvblBoYXNlIHBoYXNlLCBS ZW5kZXJCb3gmIGdyaWRJdGVtLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBH cmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkKK0xheW91dFVuaXQgUmVuZGVyR3JpZDo6Y3VycmVu dEl0ZW1TaXplRm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZShUcmFja1NpemVDb21wdXRhdGlv blBoYXNlIHBoYXNlLCBSZW5kZXJCb3gmIGdyaWRJdGVtLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rp b24gZGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkgY29uc3QKIHsKICAgICBz d2l0Y2ggKHBoYXNlKSB7CiAgICAgY2FzZSBSZXNvbHZlSW50cmluc2ljTWluaW11bXM6CkBAIC0x MTAxLDcgKzExMDEsNyBAQCBMYXlvdXRVbml0IFJlbmRlckdyaWQ6OmN1cnJlbnRJdGVtU2l6ZUZv clRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UoVHJhY2tTaXplQ29tcAogfQogCiB0ZW1wbGF0ZSA8 UmVuZGVyR3JpZDo6VHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZSBwaGFzZT4KLXZvaWQgUmVuZGVy R3JpZDo6cmVzb2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zRm9ySXRlbXMoR3Jp ZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0Rh dGEsIGNvbnN0IEdyaWRJdGVtc1NwYW5Hcm91cFJhbmdlJiBncmlkSXRlbXNXaXRoU3BhbikKK3Zv aWQgUmVuZGVyR3JpZDo6cmVzb2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zRm9y SXRlbXMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEm IHNpemluZ0RhdGEsIGNvbnN0IEdyaWRJdGVtc1NwYW5Hcm91cFJhbmdlJiBncmlkSXRlbXNXaXRo U3BhbikgY29uc3QKIHsKICAgICBWZWN0b3I8R3JpZFRyYWNrPiYgdHJhY2tzID0gKGRpcmVjdGlv biA9PSBGb3JDb2x1bW5zKSA/IHNpemluZ0RhdGEuY29sdW1uVHJhY2tzIDogc2l6aW5nRGF0YS5y b3dUcmFja3M7CiAgICAgZm9yIChjb25zdCBhdXRvJiB0cmFja0luZGV4IDogc2l6aW5nRGF0YS5j b250ZW50U2l6ZWRUcmFja3NJbmRleCkgewpAQCAtMTE2Miw3ICsxMTYyLDcgQEAgc3RhdGljIGJv b2wgc29ydEJ5R3JpZFRyYWNrR3Jvd3RoUG90ZW50aWFsKGNvbnN0IEdyaWRUcmFjayogdHJhY2sx LCBjb25zdCBHcmlkVHIKIH0KIAogdGVtcGxhdGUgPFJlbmRlckdyaWQ6OlRyYWNrU2l6ZUNvbXB1 dGF0aW9uUGhhc2UgcGhhc2U+Ci12b2lkIFJlbmRlckdyaWQ6OmRpc3RyaWJ1dGVTcGFjZVRvVHJh Y2tzKFZlY3RvcjxHcmlkVHJhY2sqPiYgdHJhY2tzLCBjb25zdCBWZWN0b3I8R3JpZFRyYWNrKj4q IGdyb3dCZXlvbmRHcm93dGhMaW1pdHNUcmFja3MsIExheW91dFVuaXQmIGZyZWVTcGFjZSkKK3Zv aWQgUmVuZGVyR3JpZDo6ZGlzdHJpYnV0ZVNwYWNlVG9UcmFja3MoVmVjdG9yPEdyaWRUcmFjayo+ JiB0cmFja3MsIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2sqPiogZ3Jvd0JleW9uZEdyb3d0aExpbWl0 c1RyYWNrcywgTGF5b3V0VW5pdCYgZnJlZVNwYWNlKSBjb25zdAogewogICAgIEFTU0VSVChmcmVl U3BhY2UgPj0gMCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJHcmlkLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCmluZGV4IGNl MDFhNmRjZDU4ZTEzMDQ3ZmU3NzZhMzdhZTg0MThjZGI3OTdiNjUuLmFmMDE2N2I0YjFlNDUyYjcy YjVhYWM2MTkwMzQxMzkwM2M3YjQ3NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJHcmlkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdy aWQuaApAQCAtNzQsMTAgKzc0LDEwIEBAIHByaXZhdGU6CiAKICAgICBjbGFzcyBHcmlkSXRlcmF0 b3I7CiAgICAgY2xhc3MgR3JpZFNpemluZ0RhdGE7Ci0gICAgdm9pZCBjb21wdXRlVXNlZEJyZWFk dGhPZkdyaWRUcmFja3MoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYs IExheW91dFVuaXQmIGJhc2VTaXplc1dpdGhvdXRNYXhpbWl6YXRpb24sIExheW91dFVuaXQmIGdy b3d0aExpbWl0c1dpdGhvdXRNYXhpbWl6YXRpb24pOworICAgIHZvaWQgY29tcHV0ZVVzZWRCcmVh ZHRoT2ZHcmlkVHJhY2tzKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEm LCBMYXlvdXRVbml0JiBiYXNlU2l6ZXNXaXRob3V0TWF4aW1pemF0aW9uLCBMYXlvdXRVbml0JiBn cm93dGhMaW1pdHNXaXRob3V0TWF4aW1pemF0aW9uKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNv bXB1dGVVc2VkQnJlYWR0aE9mTWluTGVuZ3RoKGNvbnN0IEdyaWRMZW5ndGgmLCBMYXlvdXRVbml0 IG1heFNpemUpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29tcHV0ZVVzZWRCcmVhZHRoT2ZNYXhM ZW5ndGgoY29uc3QgR3JpZExlbmd0aCYsIExheW91dFVuaXQgdXNlZEJyZWFkdGgsIExheW91dFVu aXQgbWF4U2l6ZSkgY29uc3Q7Ci0gICAgdm9pZCByZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXpp bmdGdW5jdGlvbnMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYpOwor ICAgIHZvaWQgcmVzb2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zKEdyaWRUcmFj a1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmKSBjb25zdDsKIAogICAgIHZvaWQgZW5z dXJlR3JpZFNpemUodW5zaWduZWQgbWF4aW11bVJvd1NpemUsIHVuc2lnbmVkIG1heGltdW1Db2x1 bW5TaXplKTsKICAgICB2b2lkIGluc2VydEl0ZW1JbnRvR3JpZChSZW5kZXJCb3gmLCBjb25zdCBH cmlkQXJlYSYpOwpAQCAtMTIzLDEyICsxMjMsMTIgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgYm9v bCB0cmFja1Nob3VsZEdyb3dCZXlvbmRHcm93dGhMaW1pdHNGb3JUcmFja1NpemVDb21wdXRhdGlv blBoYXNlKFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UsIGNvbnN0IEdyaWRUcmFja1NpemUmKTsK ICAgICBzdGF0aWMgdm9pZCBtYXJrQXNJbmZpbml0ZWx5R3Jvd2FibGVGb3JUcmFja1NpemVDb21w dXRhdGlvblBoYXNlKFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UsIEdyaWRUcmFjayYpOwogICAg IHN0YXRpYyB2b2lkIHVwZGF0ZVRyYWNrU2l6ZUZvclRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2Uo VHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZSwgR3JpZFRyYWNrJik7Ci0gICAgTGF5b3V0VW5pdCBj dXJyZW50SXRlbVNpemVGb3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6ZUNvbXB1 dGF0aW9uUGhhc2UsIFJlbmRlckJveCYsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNp emluZ0RhdGEmKTsKKyAgICBMYXlvdXRVbml0IGN1cnJlbnRJdGVtU2l6ZUZvclRyYWNrU2l6ZUNv bXB1dGF0aW9uUGhhc2UoVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZSwgUmVuZGVyQm94JiwgR3Jp ZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYpIGNvbnN0OwogCiAgICAgdHlw ZWRlZiBzdHJ1Y3QgR3JpZEl0ZW1zU3Bhbkdyb3VwUmFuZ2UgR3JpZEl0ZW1zU3Bhbkdyb3VwUmFu Z2U7Ci0gICAgdm9pZCByZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnNGb3JO b25TcGFubmluZ0l0ZW1zKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgY29uc3QgR3JpZFNwYW4m LCBSZW5kZXJCb3gmIGdyaWRJdGVtLCBHcmlkVHJhY2smLCBHcmlkU2l6aW5nRGF0YSYpOwotICAg IHRlbXBsYXRlIDxUcmFja1NpemVDb21wdXRhdGlvblBoYXNlPiB2b2lkIHJlc29sdmVDb250ZW50 QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvckl0ZW1zKEdyaWRUcmFja1NpemluZ0RpcmVjdGlv biwgR3JpZFNpemluZ0RhdGEmLCBjb25zdCBHcmlkSXRlbXNTcGFuR3JvdXBSYW5nZSYpOwotICAg IHRlbXBsYXRlIDxUcmFja1NpemVDb21wdXRhdGlvblBoYXNlPiB2b2lkIGRpc3RyaWJ1dGVTcGFj ZVRvVHJhY2tzKFZlY3RvcjxHcmlkVHJhY2sqPiYsIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2sqPiog Z3Jvd0JleW9uZEdyb3d0aExpbWl0c1RyYWNrcywgTGF5b3V0VW5pdCYgYXZhaWxhYmxlTG9naWNh bFNwYWNlKTsKKyAgICB2b2lkIHJlc29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9u c0Zvck5vblNwYW5uaW5nSXRlbXMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBjb25zdCBHcmlk U3BhbiYsIFJlbmRlckJveCYgZ3JpZEl0ZW0sIEdyaWRUcmFjayYsIEdyaWRTaXppbmdEYXRhJikg Y29uc3Q7CisgICAgdGVtcGxhdGUgPFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2U+IHZvaWQgcmVz b2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zRm9ySXRlbXMoR3JpZFRyYWNrU2l6 aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYsIGNvbnN0IEdyaWRJdGVtc1NwYW5Hcm91cFJh bmdlJikgY29uc3Q7CisgICAgdGVtcGxhdGUgPFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2U+IHZv aWQgZGlzdHJpYnV0ZVNwYWNlVG9UcmFja3MoVmVjdG9yPEdyaWRUcmFjayo+JiwgY29uc3QgVmVj dG9yPEdyaWRUcmFjayo+KiBncm93QmV5b25kR3Jvd3RoTGltaXRzVHJhY2tzLCBMYXlvdXRVbml0 JiBhdmFpbGFibGVMb2dpY2FsU3BhY2UpIGNvbnN0OwogCiAgICAgdHlwZWRlZiBIYXNoU2V0PHVu c2lnbmVkLCBEZWZhdWx0SGFzaDx1bnNpZ25lZD46Okhhc2gsIFdURjo6VW5zaWduZWRXaXRoWmVy b0tleUhhc2hUcmFpdHM8dW5zaWduZWQ+PiBUcmFja0luZGV4U2V0OwogICAgIGRvdWJsZSBjb21w dXRlRmxleEZhY3RvclVuaXRTaXplKGNvbnN0IFZlY3RvcjxHcmlkVHJhY2s+JiwgR3JpZFRyYWNr U2l6aW5nRGlyZWN0aW9uLCBkb3VibGUgZmxleEZhY3RvclN1bSwgTGF5b3V0VW5pdCBsZWZ0T3Zl clNwYWNlLCBjb25zdCBWZWN0b3I8dW5zaWduZWQsIDg+JiBmbGV4aWJsZVRyYWNrc0luZGV4ZXMs IHN0ZDo6dW5pcXVlX3B0cjxUcmFja0luZGV4U2V0PiB0cmFja3NUb1RyZWF0QXNJbmZsZXhpYmxl ID0gbnVsbHB0cikgY29uc3Q7CkBAIC0xMzcsMTEgKzEzNywxMSBAQCBwcml2YXRlOgogICAgIGNv bnN0IEdyaWRUcmFja1NpemUmIHJhd0dyaWRUcmFja1NpemUoR3JpZFRyYWNrU2l6aW5nRGlyZWN0 aW9uLCB1bnNpZ25lZCkgY29uc3Q7CiAgICAgR3JpZFRyYWNrU2l6ZSBncmlkVHJhY2tTaXplKEdy aWRUcmFja1NpemluZ0RpcmVjdGlvbiwgdW5zaWduZWQpIGNvbnN0OwogCi0gICAgYm9vbCB1cGRh dGVPdmVycmlkZUNvbnRhaW5pbmdCbG9ja0NvbnRlbnRMb2dpY2FsV2lkdGhGb3JDaGlsZChSZW5k ZXJCb3gmLCBHcmlkU2l6aW5nRGF0YSYpOwotICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodEZv ckNoaWxkKFJlbmRlckJveCYsIEdyaWRTaXppbmdEYXRhJik7Ci0gICAgTGF5b3V0VW5pdCBtaW5T aXplRm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6 aW5nRGF0YSYpOwotICAgIExheW91dFVuaXQgbWluQ29udGVudEZvckNoaWxkKFJlbmRlckJveCYs IEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmKTsKLSAgICBMYXlvdXRV bml0IG1heENvbnRlbnRGb3JDaGlsZChSZW5kZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rp b24sIEdyaWRTaXppbmdEYXRhJik7CisgICAgYm9vbCB1cGRhdGVPdmVycmlkZUNvbnRhaW5pbmdC bG9ja0NvbnRlbnRMb2dpY2FsV2lkdGhGb3JDaGlsZChSZW5kZXJCb3gmLCBHcmlkU2l6aW5nRGF0 YSYpIGNvbnN0OworICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodEZvckNoaWxkKFJlbmRlckJv eCYsIEdyaWRTaXppbmdEYXRhJikgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBtaW5TaXplRm9yQ2hp bGQoUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYp IGNvbnN0OworICAgIExheW91dFVuaXQgbWluQ29udGVudEZvckNoaWxkKFJlbmRlckJveCYsIEdy aWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmKSBjb25zdDsKKyAgICBMYXlv dXRVbml0IG1heENvbnRlbnRGb3JDaGlsZChSZW5kZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJl Y3Rpb24sIEdyaWRTaXppbmdEYXRhJikgY29uc3Q7CiAgICAgR3JpZEF4aXNQb3NpdGlvbiBjb2x1 bW5BeGlzUG9zaXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsKICAgICBHcmlk QXhpc1Bvc2l0aW9uIHJvd0F4aXNQb3NpdGlvbkZvckNoaWxkKGNvbnN0IFJlbmRlckJveCYpIGNv bnN0OwogICAgIExheW91dFVuaXQgY29sdW1uQXhpc09mZnNldEZvckNoaWxkKGNvbnN0IFJlbmRl ckJveCYpIGNvbnN0Owo= 283532 2016-07-13 09:03:31 -0700 2016-07-13 09:10:08 -0700 Patch bug-159716-20160713180229.patch text/plain 14283 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjZkMjI5ZWVmMzU5YzRl NDU5ZDgyODYyNTBkMTYwN2QxYjQ3MWYwOS4uMDU3YTU0MGIxZmQwODdkMWFiOTVlNDVkNmNmYzVl ZTg0ZmM0MTE4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTA3LTEzICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gQ29uc3QtaWZ5IHRyYWNrIHNpemluZyBhbGdvcml0aG0KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbCB0aGUgbWV0aG9kcyB1c2VkIHRvIHJ1biB0 aGUgdHJhY2sgc2l6aW5nIGFsZ29yaXRobSBzaG91bGQgbm90CisgICAgICAgIG1vZGlmeSB0aGUg c3RhdGUgb2YgTGF5b3V0R3JpZC4gV2UgY2FuIHNhZmVseSBjb25zdC1pZnkgYWxsIG9mIHRoZW0K KyAgICAgICAgYW5kIHJlbW92ZSB0aGUgdWdseSBjb25zdF9jYXN0IGluIGNvbXB1dGVJbnRyaW5z aWNMb2dpY2FsV2lkdGhzKCkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZCBhcyB0aGVy ZSBpcyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy R3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpsb2dpY2FsSGVpZ2h0Rm9y Q2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6bWluU2l6ZUZvckNoaWxkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OnVwZGF0ZU92ZXJyaWRlQ29udGFpbmluZ0Js b2NrQ29udGVudExvZ2ljYWxXaWR0aEZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckdyaWQ6Om1pbkNvbnRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlk OjptYXhDb250ZW50Rm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6cmVz b2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckdyaWQ6OnJlc29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvck5v blNwYW5uaW5nSXRlbXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y3VycmVudEl0 ZW1TaXplRm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnNGb3JJdGVt cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpkaXN0cmlidXRlU3BhY2VUb1RyYWNr cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuaDoKKwogMjAxNi0wNy0xMyAgUGhp bGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1l cl1bR0xdIGNyYXNoIHdpdGhpbiB0cmlnZ2VyUmVwYWludApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckdyaWQuY3BwCmluZGV4IDQ2ZGM1OTg5NWI1MjhhZThmYjRhOWEyOTFhNjNlMmQ3MmI5 YjY5ZTEuLjRlNGMyNjE0NDY1NmM3MjljOTBjYjYwZTJkYWJjOGU3MjhiYTJlMjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTQ2NCw4ICs0NjQsOCBAQCB2b2lk IFJlbmRlckdyaWQ6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1p bkxvZ2ljYWxXaWR0aCwgTGF5bwogCiAgICAgR3JpZFNpemluZ0RhdGEgc2l6aW5nRGF0YShncmlk Q29sdW1uQ291bnQoKSwgZ3JpZFJvd0NvdW50KCkpOwogICAgIHNpemluZ0RhdGEuc2V0RnJlZVNw YWNlRm9yRGlyZWN0aW9uKEZvckNvbHVtbnMsIE51bGxvcHQpOwotICAgIHNpemluZ0RhdGEuc2l6 aW5nT3BlcmF0aW9uID0gSW50cmluc2ljU2l6ZUNvbXB1dGF0aW9uOwotICAgIGNvbnN0X2Nhc3Q8 UmVuZGVyR3JpZCo+KHRoaXMpLT5jb21wdXRlVXNlZEJyZWFkdGhPZkdyaWRUcmFja3MoRm9yQ29s dW1ucywgc2l6aW5nRGF0YSwgbWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOworICAg IHNpemluZ0RhdGEuc2l6aW5nT3BlcmF0aW9uID0gR3JpZFNpemluZ0RhdGE6OkludHJpbnNpY1Np emVDb21wdXRhdGlvbjsKKyAgICBjb21wdXRlVXNlZEJyZWFkdGhPZkdyaWRUcmFja3MoRm9yQ29s dW1ucywgc2l6aW5nRGF0YSwgbWluTG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOwogCiAg ICAgTGF5b3V0VW5pdCB0b3RhbEd1dHRlcnNTaXplID0gZ3V0dGVyc1NpemUoRm9yQ29sdW1ucywg c2l6aW5nRGF0YS5jb2x1bW5UcmFja3Muc2l6ZSgpKTsKICAgICBtaW5Mb2dpY2FsV2lkdGggKz0g dG90YWxHdXR0ZXJzU2l6ZTsKQEAgLTUzMCw3ICs1MzAsNyBAQCBzdGF0aWMgaW5saW5lIGRvdWJs ZSBub3JtYWxpemVkRmxleEZyYWN0aW9uKGNvbnN0IEdyaWRUcmFjayYgdHJhY2ssIGRvdWJsZSBm bGV4RgogICAgIHJldHVybiB0cmFjay5iYXNlU2l6ZSgpIC8gc3RkOjptYXg8ZG91YmxlPigxLCBm bGV4RmFjdG9yKTsKIH0KIAotdm9pZCBSZW5kZXJHcmlkOjpjb21wdXRlVXNlZEJyZWFkdGhPZkdy aWRUcmFja3MoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0Rh dGEmIHNpemluZ0RhdGEsIExheW91dFVuaXQmIGJhc2VTaXplc1dpdGhvdXRNYXhpbWl6YXRpb24s IExheW91dFVuaXQmIGdyb3d0aExpbWl0c1dpdGhvdXRNYXhpbWl6YXRpb24pCit2b2lkIFJlbmRl ckdyaWQ6OmNvbXB1dGVVc2VkQnJlYWR0aE9mR3JpZFRyYWNrcyhHcmlkVHJhY2tTaXppbmdEaXJl Y3Rpb24gZGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSwgTGF5b3V0VW5pdCYg YmFzZVNpemVzV2l0aG91dE1heGltaXphdGlvbiwgTGF5b3V0VW5pdCYgZ3Jvd3RoTGltaXRzV2l0 aG91dE1heGltaXphdGlvbikgY29uc3QKIHsKICAgICBjb25zdCBPcHRpb25hbDxMYXlvdXRVbml0 PiBpbml0aWFsRnJlZVNwYWNlID0gc2l6aW5nRGF0YS5mcmVlU3BhY2VGb3JEaXJlY3Rpb24oZGly ZWN0aW9uKTsKICAgICBWZWN0b3I8R3JpZFRyYWNrPiYgdHJhY2tzID0gKGRpcmVjdGlvbiA9PSBG b3JDb2x1bW5zKSA/IHNpemluZ0RhdGEuY29sdW1uVHJhY2tzIDogc2l6aW5nRGF0YS5yb3dUcmFj a3M7CkBAIC03NzcsNyArNzc3LDcgQEAgR3JpZFRyYWNrU2l6ZSBSZW5kZXJHcmlkOjpncmlkVHJh Y2tTaXplKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIHVuc2kKICAgICByZXR1 cm4gR3JpZFRyYWNrU2l6ZShtaW5UcmFja0JyZWFkdGgsIG1heFRyYWNrQnJlYWR0aCk7CiB9CiAK LUxheW91dFVuaXQgUmVuZGVyR3JpZDo6bG9naWNhbEhlaWdodEZvckNoaWxkKFJlbmRlckJveCYg Y2hpbGQsIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKQorTGF5b3V0VW5pdCBSZW5kZXJHcmlk Ojpsb2dpY2FsSGVpZ2h0Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFNpemluZ0RhdGEm IHNpemluZ0RhdGEpIGNvbnN0CiB7CiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gb2xkT3ZlcnJp ZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoID0gY2hpbGQuaGFzT3ZlcnJpZGVD b250YWluaW5nQmxvY2tMb2dpY2FsV2lkdGgoKSA/IGNoaWxkLm92ZXJyaWRlQ29udGFpbmluZ0Js b2NrQ29udGVudExvZ2ljYWxXaWR0aCgpIDogTGF5b3V0VW5pdCgpOwogICAgIExheW91dFVuaXQg b3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoID0gZ3JpZEFyZWFCcmVh ZHRoRm9yQ2hpbGQoY2hpbGQsIEZvckNvbHVtbnMsIHNpemluZ0RhdGEuY29sdW1uVHJhY2tzKTsK QEAgLTc5Nyw3ICs3OTcsNyBAQCBMYXlvdXRVbml0IFJlbmRlckdyaWQ6OmxvZ2ljYWxIZWlnaHRG b3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBHcmlkU2l6aW5nRGF0YSYgcwogICAgIHJldHVybiBj aGlsZC5sb2dpY2FsSGVpZ2h0KCkgKyBjaGlsZC5tYXJnaW5Mb2dpY2FsSGVpZ2h0KCk7CiB9CiAK LUxheW91dFVuaXQgUmVuZGVyR3JpZDo6bWluU2l6ZUZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQs IEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJiBzaXpp bmdEYXRhKQorTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjptaW5TaXplRm9yQ2hpbGQoUmVuZGVyQm94 JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0Rh dGEmIHNpemluZ0RhdGEpIGNvbnN0CiB7CiAgICAgYm9vbCBoYXNPcnRob2dvbmFsV3JpdGluZ01v ZGUgPSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICE9IGlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKCk7CiAgICAgLy8gRklYTUU6IFByb3Blcmx5IHN1cHBvcnQgb3J0aG9nb25hbCB3cml0 aW5nIG1vZGUuCkBAIC04MjIsNyArODIyLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjptaW5T aXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW8KICAg ICByZXR1cm4gY2hpbGQuY29tcHV0ZUxvZ2ljYWxIZWlnaHRVc2luZyhNaW5TaXplLCBjaGlsZE1p blNpemUsIE51bGxvcHQpLnZhbHVlT3IoMCkgKyBjaGlsZC5tYXJnaW5Mb2dpY2FsSGVpZ2h0KCkg KyBjaGlsZC5zY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCk7CiB9CiAKLWJvb2wgUmVuZGVyR3JpZDo6 dXBkYXRlT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoRm9yQ2hpbGQo UmVuZGVyQm94JiBjaGlsZCwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpCitib29sIFJlbmRl ckdyaWQ6OnVwZGF0ZU92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aEZv ckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKSBjb25z dAogewogICAgIExheW91dFVuaXQgb3ZlcnJpZGVXaWR0aCA9IGdyaWRBcmVhQnJlYWR0aEZvckNo aWxkKGNoaWxkLCBGb3JDb2x1bW5zLCBzaXppbmdEYXRhLmNvbHVtblRyYWNrcyk7CiAgICAgaWYg KGNoaWxkLmhhc092ZXJyaWRlQ29udGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoKCkgJiYgY2hpbGQu b3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoKCkgPT0gb3ZlcnJpZGVX aWR0aCkKQEAgLTgzMiw3ICs4MzIsNyBAQCBib29sIFJlbmRlckdyaWQ6OnVwZGF0ZU92ZXJyaWRl Q29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aEZvckNoaWxkKFJlbmRlcgogICAgIHJl dHVybiB0cnVlOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckdyaWQ6Om1pbkNvbnRlbnRGb3JDaGls ZChSZW5kZXJCb3gmIGNoaWxkLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBH cmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkKK0xheW91dFVuaXQgUmVuZGVyR3JpZDo6bWluQ29u dGVudEZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBk aXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKSBjb25zdAogewogICAgIGJvb2wg aGFzT3J0aG9nb25hbFdyaXRpbmdNb2RlID0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUo KSAhPSBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpOwogICAgIC8vIEZJWE1FOiBQcm9wZXJseSBz dXBwb3J0IG9ydGhvZ29uYWwgd3JpdGluZyBtb2RlLgpAQCAtODU1LDcgKzg1NSw3IEBAIExheW91 dFVuaXQgUmVuZGVyR3JpZDo6bWluQ29udGVudEZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIEdy aWRUcmFja1NpemluZ0RpcmVjCiAgICAgcmV0dXJuIGxvZ2ljYWxIZWlnaHRGb3JDaGlsZChjaGls ZCwgc2l6aW5nRGF0YSk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyR3JpZDo6bWF4Q29udGVudEZv ckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rp b24sIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKQorTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpt YXhDb250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0 aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpIGNvbnN0CiB7CiAgICAg Ym9vbCBoYXNPcnRob2dvbmFsV3JpdGluZ01vZGUgPSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5n TW9kZSgpICE9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CiAgICAgLy8gRklYTUU6IFByb3Bl cmx5IHN1cHBvcnQgb3J0aG9nb25hbCB3cml0aW5nIG1vZGUuCkBAIC05MTUsNyArOTE1LDcgQEAg c3RydWN0IEdyaWRJdGVtc1NwYW5Hcm91cFJhbmdlIHsKICAgICBWZWN0b3I8R3JpZEl0ZW1XaXRo U3Bhbj46Oml0ZXJhdG9yIHJhbmdlRW5kOwogfTsKIAotdm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZl Q29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9u IGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpCit2b2lkIFJlbmRlckdyaWQ6 OnJlc29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9ucyhHcmlkVHJhY2tTaXppbmdE aXJlY3Rpb24gZGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkgY29uc3QKIHsK ICAgICBzaXppbmdEYXRhLml0ZW1zU29ydGVkQnlJbmNyZWFzaW5nU3Bhbi5zaHJpbmsoMCk7CiAg ICAgSGFzaFNldDxSZW5kZXJCb3gqPiBpdGVtc1NldDsKQEAgLTk1Niw3ICs5NTYsNyBAQCB2b2lk IFJlbmRlckdyaWQ6OnJlc29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9ucyhHcmlk VHJhY2tTaXppbmdEaXJlY3RpbwogICAgIH0KIH0KIAotdm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZl Q29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnNGb3JOb25TcGFubmluZ0l0ZW1zKEdyaWRU cmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIGNvbnN0IEdyaWRTcGFuJiBzcGFuLCBSZW5k ZXJCb3gmIGdyaWRJdGVtLCBHcmlkVHJhY2smIHRyYWNrLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5n RGF0YSkKK3ZvaWQgUmVuZGVyR3JpZDo6cmVzb2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVu Y3Rpb25zRm9yTm9uU3Bhbm5pbmdJdGVtcyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0 aW9uLCBjb25zdCBHcmlkU3BhbiYgc3BhbiwgUmVuZGVyQm94JiBncmlkSXRlbSwgR3JpZFRyYWNr JiB0cmFjaywgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpIGNvbnN0CiB7CiAgICAgdW5zaWdu ZWQgdHJhY2tQb3NpdGlvbiA9IHNwYW4uc3RhcnRMaW5lKCk7CiAgICAgR3JpZFRyYWNrU2l6ZSB0 cmFja1NpemUgPSBncmlkVHJhY2tTaXplKGRpcmVjdGlvbiwgdHJhY2tQb3NpdGlvbiwgc2l6aW5n RGF0YS5zaXppbmdPcGVyYXRpb24pOwpAQCAtMTA3Niw3ICsxMDc2LDcgQEAgdm9pZCBSZW5kZXJH cmlkOjp1cGRhdGVUcmFja1NpemVGb3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6 ZUNvbXB1dGF0aW8KICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotTGF5b3V0VW5pdCBS ZW5kZXJHcmlkOjpjdXJyZW50SXRlbVNpemVGb3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRy YWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UgcGhhc2UsIFJlbmRlckJveCYgZ3JpZEl0ZW0sIEdyaWRU cmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRh KQorTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpjdXJyZW50SXRlbVNpemVGb3JUcmFja1NpemVDb21w dXRhdGlvblBoYXNlKFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UgcGhhc2UsIFJlbmRlckJveCYg Z3JpZEl0ZW0sIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIEdyaWRTaXppbmdE YXRhJiBzaXppbmdEYXRhKSBjb25zdAogewogICAgIHN3aXRjaCAocGhhc2UpIHsKICAgICBjYXNl IFJlc29sdmVJbnRyaW5zaWNNaW5pbXVtczoKQEAgLTEwOTcsNyArMTA5Nyw3IEBAIExheW91dFVu aXQgUmVuZGVyR3JpZDo6Y3VycmVudEl0ZW1TaXplRm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFz ZShUcmFja1NpemVDb21wCiB9CiAKIHRlbXBsYXRlIDxSZW5kZXJHcmlkOjpUcmFja1NpemVDb21w dXRhdGlvblBoYXNlIHBoYXNlPgotdm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2Vk VHJhY2tTaXppbmdGdW5jdGlvbnNGb3JJdGVtcyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGly ZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSwgY29uc3QgR3JpZEl0ZW1zU3Bhbkdy b3VwUmFuZ2UmIGdyaWRJdGVtc1dpdGhTcGFuKQordm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZlQ29u dGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnNGb3JJdGVtcyhHcmlkVHJhY2tTaXppbmdEaXJl Y3Rpb24gZGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSwgY29uc3QgR3JpZEl0 ZW1zU3Bhbkdyb3VwUmFuZ2UmIGdyaWRJdGVtc1dpdGhTcGFuKSBjb25zdAogewogICAgIFZlY3Rv cjxHcmlkVHJhY2s+JiB0cmFja3MgPSAoZGlyZWN0aW9uID09IEZvckNvbHVtbnMpID8gc2l6aW5n RGF0YS5jb2x1bW5UcmFja3MgOiBzaXppbmdEYXRhLnJvd1RyYWNrczsKICAgICBmb3IgKGNvbnN0 IGF1dG8mIHRyYWNrSW5kZXggOiBzaXppbmdEYXRhLmNvbnRlbnRTaXplZFRyYWNrc0luZGV4KSB7 CkBAIC0xMTU4LDcgKzExNTgsNyBAQCBzdGF0aWMgYm9vbCBzb3J0QnlHcmlkVHJhY2tHcm93dGhQ b3RlbnRpYWwoY29uc3QgR3JpZFRyYWNrKiB0cmFjazEsIGNvbnN0IEdyaWRUcgogfQogCiB0ZW1w bGF0ZSA8UmVuZGVyR3JpZDo6VHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZSBwaGFzZT4KLXZvaWQg UmVuZGVyR3JpZDo6ZGlzdHJpYnV0ZVNwYWNlVG9UcmFja3MoVmVjdG9yPEdyaWRUcmFjayo+JiB0 cmFja3MsIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2sqPiogZ3Jvd0JleW9uZEdyb3d0aExpbWl0c1Ry YWNrcywgTGF5b3V0VW5pdCYgZnJlZVNwYWNlKQordm9pZCBSZW5kZXJHcmlkOjpkaXN0cmlidXRl U3BhY2VUb1RyYWNrcyhWZWN0b3I8R3JpZFRyYWNrKj4mIHRyYWNrcywgY29uc3QgVmVjdG9yPEdy aWRUcmFjayo+KiBncm93QmV5b25kR3Jvd3RoTGltaXRzVHJhY2tzLCBMYXlvdXRVbml0JiBmcmVl U3BhY2UpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGZyZWVTcGFjZSA+PSAwKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJHcmlkLmgKaW5kZXggZTFkMTA3MzJmNjM5ZTk5ODE0ODk0ZWMwNDJh N2QzNWIyNzllMjkwNS4uNTM3ZDQ2ODg0MTYwMDQ5MDA2NWU2OTMwZjMyNDk4ODlmMWEzNjA0YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5oCkBAIC03NSwxMCArNzUsMTAgQEAg cHJpdmF0ZToKICAgICBjbGFzcyBHcmlkSXRlcmF0b3I7CiAgICAgY2xhc3MgR3JpZFNpemluZ0Rh dGE7CiAgICAgZW51bSBTaXppbmdPcGVyYXRpb24geyBUcmFja1NpemluZywgSW50cmluc2ljU2l6 ZUNvbXB1dGF0aW9uIH07Ci0gICAgdm9pZCBjb21wdXRlVXNlZEJyZWFkdGhPZkdyaWRUcmFja3Mo R3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYsIExheW91dFVuaXQmIGJh c2VTaXplc1dpdGhvdXRNYXhpbWl6YXRpb24sIExheW91dFVuaXQmIGdyb3d0aExpbWl0c1dpdGhv dXRNYXhpbWl6YXRpb24pOworICAgIHZvaWQgY29tcHV0ZVVzZWRCcmVhZHRoT2ZHcmlkVHJhY2tz KEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmLCBMYXlvdXRVbml0JiBi YXNlU2l6ZXNXaXRob3V0TWF4aW1pemF0aW9uLCBMYXlvdXRVbml0JiBncm93dGhMaW1pdHNXaXRo b3V0TWF4aW1pemF0aW9uKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbXB1dGVVc2VkQnJlYWR0 aE9mTWluTGVuZ3RoKGNvbnN0IEdyaWRMZW5ndGgmLCBMYXlvdXRVbml0IG1heFNpemUpIGNvbnN0 OwogICAgIExheW91dFVuaXQgY29tcHV0ZVVzZWRCcmVhZHRoT2ZNYXhMZW5ndGgoY29uc3QgR3Jp ZExlbmd0aCYsIExheW91dFVuaXQgdXNlZEJyZWFkdGgsIExheW91dFVuaXQgbWF4U2l6ZSkgY29u c3Q7Ci0gICAgdm9pZCByZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnMoR3Jp ZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYpOworICAgIHZvaWQgcmVzb2x2 ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zKEdyaWRUcmFja1NpemluZ0RpcmVjdGlv biwgR3JpZFNpemluZ0RhdGEmKSBjb25zdDsKIAogICAgIHZvaWQgZW5zdXJlR3JpZFNpemUodW5z aWduZWQgbWF4aW11bVJvd1NpemUsIHVuc2lnbmVkIG1heGltdW1Db2x1bW5TaXplKTsKICAgICB2 b2lkIGluc2VydEl0ZW1JbnRvR3JpZChSZW5kZXJCb3gmLCBjb25zdCBHcmlkQXJlYSYpOwpAQCAt MTI0LDEyICsxMjQsMTIgQEAgcHJpdmF0ZToKICAgICBzdGF0aWMgYm9vbCB0cmFja1Nob3VsZEdy b3dCZXlvbmRHcm93dGhMaW1pdHNGb3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6 ZUNvbXB1dGF0aW9uUGhhc2UsIGNvbnN0IEdyaWRUcmFja1NpemUmKTsKICAgICBzdGF0aWMgdm9p ZCBtYXJrQXNJbmZpbml0ZWx5R3Jvd2FibGVGb3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRy YWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UsIEdyaWRUcmFjayYpOwogICAgIHN0YXRpYyB2b2lkIHVw ZGF0ZVRyYWNrU2l6ZUZvclRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UoVHJhY2tTaXplQ29tcHV0 YXRpb25QaGFzZSwgR3JpZFRyYWNrJik7Ci0gICAgTGF5b3V0VW5pdCBjdXJyZW50SXRlbVNpemVG b3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UsIFJl bmRlckJveCYsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmKTsKKyAg ICBMYXlvdXRVbml0IGN1cnJlbnRJdGVtU2l6ZUZvclRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2Uo VHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZSwgUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGly ZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYpIGNvbnN0OwogCiAgICAgdHlwZWRlZiBzdHJ1Y3QgR3Jp ZEl0ZW1zU3Bhbkdyb3VwUmFuZ2UgR3JpZEl0ZW1zU3Bhbkdyb3VwUmFuZ2U7Ci0gICAgdm9pZCBy ZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnNGb3JOb25TcGFubmluZ0l0ZW1z KEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgY29uc3QgR3JpZFNwYW4mLCBSZW5kZXJCb3gmIGdy aWRJdGVtLCBHcmlkVHJhY2smLCBHcmlkU2l6aW5nRGF0YSYpOwotICAgIHRlbXBsYXRlIDxUcmFj a1NpemVDb21wdXRhdGlvblBoYXNlPiB2b2lkIHJlc29sdmVDb250ZW50QmFzZWRUcmFja1Npemlu Z0Z1bmN0aW9uc0Zvckl0ZW1zKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0Rh dGEmLCBjb25zdCBHcmlkSXRlbXNTcGFuR3JvdXBSYW5nZSYpOwotICAgIHRlbXBsYXRlIDxUcmFj a1NpemVDb21wdXRhdGlvblBoYXNlPiB2b2lkIGRpc3RyaWJ1dGVTcGFjZVRvVHJhY2tzKFZlY3Rv cjxHcmlkVHJhY2sqPiYsIGNvbnN0IFZlY3RvcjxHcmlkVHJhY2sqPiogZ3Jvd0JleW9uZEdyb3d0 aExpbWl0c1RyYWNrcywgTGF5b3V0VW5pdCYgYXZhaWxhYmxlTG9naWNhbFNwYWNlKTsKKyAgICB2 b2lkIHJlc29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvck5vblNwYW5uaW5n SXRlbXMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBjb25zdCBHcmlkU3BhbiYsIFJlbmRlckJv eCYgZ3JpZEl0ZW0sIEdyaWRUcmFjayYsIEdyaWRTaXppbmdEYXRhJikgY29uc3Q7CisgICAgdGVt cGxhdGUgPFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2U+IHZvaWQgcmVzb2x2ZUNvbnRlbnRCYXNl ZFRyYWNrU2l6aW5nRnVuY3Rpb25zRm9ySXRlbXMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBH cmlkU2l6aW5nRGF0YSYsIGNvbnN0IEdyaWRJdGVtc1NwYW5Hcm91cFJhbmdlJikgY29uc3Q7Cisg ICAgdGVtcGxhdGUgPFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2U+IHZvaWQgZGlzdHJpYnV0ZVNw YWNlVG9UcmFja3MoVmVjdG9yPEdyaWRUcmFjayo+JiwgY29uc3QgVmVjdG9yPEdyaWRUcmFjayo+ KiBncm93QmV5b25kR3Jvd3RoTGltaXRzVHJhY2tzLCBMYXlvdXRVbml0JiBhdmFpbGFibGVMb2dp Y2FsU3BhY2UpIGNvbnN0OwogCiAgICAgdHlwZWRlZiBIYXNoU2V0PHVuc2lnbmVkLCBEZWZhdWx0 SGFzaDx1bnNpZ25lZD46Okhhc2gsIFdURjo6VW5zaWduZWRXaXRoWmVyb0tleUhhc2hUcmFpdHM8 dW5zaWduZWQ+PiBUcmFja0luZGV4U2V0OwogICAgIGRvdWJsZSBjb21wdXRlRmxleEZhY3RvclVu aXRTaXplKGNvbnN0IFZlY3RvcjxHcmlkVHJhY2s+JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9u LCBTaXppbmdPcGVyYXRpb24sIGRvdWJsZSBmbGV4RmFjdG9yU3VtLCBMYXlvdXRVbml0IGxlZnRP dmVyU3BhY2UsIGNvbnN0IFZlY3Rvcjx1bnNpZ25lZCwgOD4mIGZsZXhpYmxlVHJhY2tzSW5kZXhl cywgc3RkOjp1bmlxdWVfcHRyPFRyYWNrSW5kZXhTZXQ+IHRyYWNrc1RvVHJlYXRBc0luZmxleGli bGUgPSBudWxscHRyKSBjb25zdDsKQEAgLTEzOCwxMSArMTM4LDExIEBAIHByaXZhdGU6CiAgICAg Y29uc3QgR3JpZFRyYWNrU2l6ZSYgcmF3R3JpZFRyYWNrU2l6ZShHcmlkVHJhY2tTaXppbmdEaXJl Y3Rpb24sIHVuc2lnbmVkKSBjb25zdDsKICAgICBHcmlkVHJhY2tTaXplIGdyaWRUcmFja1NpemUo R3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCB1bnNpZ25lZCwgU2l6aW5nT3BlcmF0aW9uKSBjb25z dDsKIAotICAgIGJvb2wgdXBkYXRlT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNh bFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFNpemluZ0RhdGEmKTsKLSAgICBMYXlvdXRV bml0IGxvZ2ljYWxIZWlnaHRGb3JDaGlsZChSZW5kZXJCb3gmLCBHcmlkU2l6aW5nRGF0YSYpOwot ICAgIExheW91dFVuaXQgbWluU2l6ZUZvckNoaWxkKFJlbmRlckJveCYsIEdyaWRUcmFja1Npemlu Z0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmKTsKLSAgICBMYXlvdXRVbml0IG1pbkNvbnRlbnRG b3JDaGlsZChSZW5kZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIEdyaWRTaXppbmdE YXRhJik7Ci0gICAgTGF5b3V0VW5pdCBtYXhDb250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiwgR3Jp ZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYpOworICAgIGJvb2wgdXBkYXRl T3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVy Qm94JiwgR3JpZFNpemluZ0RhdGEmKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWln aHRGb3JDaGlsZChSZW5kZXJCb3gmLCBHcmlkU2l6aW5nRGF0YSYpIGNvbnN0OworICAgIExheW91 dFVuaXQgbWluU2l6ZUZvckNoaWxkKFJlbmRlckJveCYsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlv biwgR3JpZFNpemluZ0RhdGEmKSBjb25zdDsKKyAgICBMYXlvdXRVbml0IG1pbkNvbnRlbnRGb3JD aGlsZChSZW5kZXJCb3gmLCBHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRh JikgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBtYXhDb250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94Jiwg R3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYpIGNvbnN0OwogICAgIEdy aWRBeGlzUG9zaXRpb24gY29sdW1uQXhpc1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94 JikgY29uc3Q7CiAgICAgR3JpZEF4aXNQb3NpdGlvbiByb3dBeGlzUG9zaXRpb25Gb3JDaGlsZChj b25zdCBSZW5kZXJCb3gmKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGNvbHVtbkF4aXNPZmZzZXRG b3JDaGlsZChjb25zdCBSZW5kZXJCb3gmKSBjb25zdDsK 283533 2016-07-13 09:10:16 -0700 2016-07-14 01:36:58 -0700 Patch bug-159716-20160713180913.patch text/plain 14205 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjZkMjI5ZWVmMzU5YzRl NDU5ZDgyODYyNTBkMTYwN2QxYjQ3MWYwOS4uMDU3YTU0MGIxZmQwODdkMWFiOTVlNDVkNmNmYzVl ZTg0ZmM0MTE4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTA3LTEzICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZ3Jp ZF0gQ29uc3QtaWZ5IHRyYWNrIHNpemluZyBhbGdvcml0aG0KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTcxNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbCB0aGUgbWV0aG9kcyB1c2VkIHRvIHJ1biB0 aGUgdHJhY2sgc2l6aW5nIGFsZ29yaXRobSBzaG91bGQgbm90CisgICAgICAgIG1vZGlmeSB0aGUg c3RhdGUgb2YgTGF5b3V0R3JpZC4gV2UgY2FuIHNhZmVseSBjb25zdC1pZnkgYWxsIG9mIHRoZW0K KyAgICAgICAgYW5kIHJlbW92ZSB0aGUgdWdseSBjb25zdF9jYXN0IGluIGNvbXB1dGVJbnRyaW5z aWNMb2dpY2FsV2lkdGhzKCkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIG5lZWRlZCBhcyB0aGVy ZSBpcyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy R3JpZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpsb2dpY2FsSGVpZ2h0Rm9y Q2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6bWluU2l6ZUZvckNoaWxkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckdyaWQ6OnVwZGF0ZU92ZXJyaWRlQ29udGFpbmluZ0Js b2NrQ29udGVudExvZ2ljYWxXaWR0aEZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckdyaWQ6Om1pbkNvbnRlbnRGb3JDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlk OjptYXhDb250ZW50Rm9yQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6cmVz b2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckdyaWQ6OnJlc29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvck5v blNwYW5uaW5nSXRlbXMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyR3JpZDo6Y3VycmVudEl0 ZW1TaXplRm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZSk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnNGb3JJdGVt cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJHcmlkOjpkaXN0cmlidXRlU3BhY2VUb1RyYWNr cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckdyaWQuaDoKKwogMjAxNi0wNy0xMyAgUGhp bGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1l cl1bR0xdIGNyYXNoIHdpdGhpbiB0cmlnZ2VyUmVwYWludApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckdyaWQuY3BwCmluZGV4IDQ2ZGM1OTg5NWI1MjhhZThmYjRhOWEyOTFhNjNlMmQ3MmI5 YjY5ZTEuLjIwODFiYmNiYThiZjdlOGFkOTc0M2E0OGJhM2EzMzBjOGNhNzVjODQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlkLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyR3JpZC5jcHAKQEAgLTQ2NSw3ICs0NjUsNyBAQCB2b2lk IFJlbmRlckdyaWQ6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1p bkxvZ2ljYWxXaWR0aCwgTGF5bwogICAgIEdyaWRTaXppbmdEYXRhIHNpemluZ0RhdGEoZ3JpZENv bHVtbkNvdW50KCksIGdyaWRSb3dDb3VudCgpKTsKICAgICBzaXppbmdEYXRhLnNldEZyZWVTcGFj ZUZvckRpcmVjdGlvbihGb3JDb2x1bW5zLCBOdWxsb3B0KTsKICAgICBzaXppbmdEYXRhLnNpemlu Z09wZXJhdGlvbiA9IEludHJpbnNpY1NpemVDb21wdXRhdGlvbjsKLSAgICBjb25zdF9jYXN0PFJl bmRlckdyaWQqPih0aGlzKS0+Y29tcHV0ZVVzZWRCcmVhZHRoT2ZHcmlkVHJhY2tzKEZvckNvbHVt bnMsIHNpemluZ0RhdGEsIG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKyAgICBj b21wdXRlVXNlZEJyZWFkdGhPZkdyaWRUcmFja3MoRm9yQ29sdW1ucywgc2l6aW5nRGF0YSwgbWlu TG9naWNhbFdpZHRoLCBtYXhMb2dpY2FsV2lkdGgpOwogCiAgICAgTGF5b3V0VW5pdCB0b3RhbEd1 dHRlcnNTaXplID0gZ3V0dGVyc1NpemUoRm9yQ29sdW1ucywgc2l6aW5nRGF0YS5jb2x1bW5UcmFj a3Muc2l6ZSgpKTsKICAgICBtaW5Mb2dpY2FsV2lkdGggKz0gdG90YWxHdXR0ZXJzU2l6ZTsKQEAg LTUzMCw3ICs1MzAsNyBAQCBzdGF0aWMgaW5saW5lIGRvdWJsZSBub3JtYWxpemVkRmxleEZyYWN0 aW9uKGNvbnN0IEdyaWRUcmFjayYgdHJhY2ssIGRvdWJsZSBmbGV4RgogICAgIHJldHVybiB0cmFj ay5iYXNlU2l6ZSgpIC8gc3RkOjptYXg8ZG91YmxlPigxLCBmbGV4RmFjdG9yKTsKIH0KIAotdm9p ZCBSZW5kZXJHcmlkOjpjb21wdXRlVXNlZEJyZWFkdGhPZkdyaWRUcmFja3MoR3JpZFRyYWNrU2l6 aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEsIExheW91 dFVuaXQmIGJhc2VTaXplc1dpdGhvdXRNYXhpbWl6YXRpb24sIExheW91dFVuaXQmIGdyb3d0aExp bWl0c1dpdGhvdXRNYXhpbWl6YXRpb24pCit2b2lkIFJlbmRlckdyaWQ6OmNvbXB1dGVVc2VkQnJl YWR0aE9mR3JpZFRyYWNrcyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBHcmlk U2l6aW5nRGF0YSYgc2l6aW5nRGF0YSwgTGF5b3V0VW5pdCYgYmFzZVNpemVzV2l0aG91dE1heGlt aXphdGlvbiwgTGF5b3V0VW5pdCYgZ3Jvd3RoTGltaXRzV2l0aG91dE1heGltaXphdGlvbikgY29u c3QKIHsKICAgICBjb25zdCBPcHRpb25hbDxMYXlvdXRVbml0PiBpbml0aWFsRnJlZVNwYWNlID0g c2l6aW5nRGF0YS5mcmVlU3BhY2VGb3JEaXJlY3Rpb24oZGlyZWN0aW9uKTsKICAgICBWZWN0b3I8 R3JpZFRyYWNrPiYgdHJhY2tzID0gKGRpcmVjdGlvbiA9PSBGb3JDb2x1bW5zKSA/IHNpemluZ0Rh dGEuY29sdW1uVHJhY2tzIDogc2l6aW5nRGF0YS5yb3dUcmFja3M7CkBAIC03NzcsNyArNzc3LDcg QEAgR3JpZFRyYWNrU2l6ZSBSZW5kZXJHcmlkOjpncmlkVHJhY2tTaXplKEdyaWRUcmFja1Npemlu Z0RpcmVjdGlvbiBkaXJlY3Rpb24sIHVuc2kKICAgICByZXR1cm4gR3JpZFRyYWNrU2l6ZShtaW5U cmFja0JyZWFkdGgsIG1heFRyYWNrQnJlYWR0aCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyR3Jp ZDo6bG9naWNhbEhlaWdodEZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIEdyaWRTaXppbmdEYXRh JiBzaXppbmdEYXRhKQorTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpsb2dpY2FsSGVpZ2h0Rm9yQ2hp bGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpIGNvbnN0CiB7 CiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gb2xkT3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250 ZW50TG9naWNhbFdpZHRoID0gY2hpbGQuaGFzT3ZlcnJpZGVDb250YWluaW5nQmxvY2tMb2dpY2Fs V2lkdGgoKSA/IGNoaWxkLm92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0 aCgpIDogTGF5b3V0VW5pdCgpOwogICAgIExheW91dFVuaXQgb3ZlcnJpZGVDb250YWluaW5nQmxv Y2tDb250ZW50TG9naWNhbFdpZHRoID0gZ3JpZEFyZWFCcmVhZHRoRm9yQ2hpbGQoY2hpbGQsIEZv ckNvbHVtbnMsIHNpemluZ0RhdGEuY29sdW1uVHJhY2tzKTsKQEAgLTc5Nyw3ICs3OTcsNyBAQCBM YXlvdXRVbml0IFJlbmRlckdyaWQ6OmxvZ2ljYWxIZWlnaHRGb3JDaGlsZChSZW5kZXJCb3gmIGNo aWxkLCBHcmlkU2l6aW5nRGF0YSYgcwogICAgIHJldHVybiBjaGlsZC5sb2dpY2FsSGVpZ2h0KCkg KyBjaGlsZC5tYXJnaW5Mb2dpY2FsSGVpZ2h0KCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyR3Jp ZDo6bWluU2l6ZUZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIEdyaWRUcmFja1NpemluZ0RpcmVj dGlvbiBkaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKQorTGF5b3V0VW5pdCBS ZW5kZXJHcmlkOjptaW5TaXplRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3JpZFRyYWNrU2l6 aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpIGNvbnN0 CiB7CiAgICAgYm9vbCBoYXNPcnRob2dvbmFsV3JpdGluZ01vZGUgPSBjaGlsZC5pc0hvcml6b250 YWxXcml0aW5nTW9kZSgpICE9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CiAgICAgLy8gRklY TUU6IFByb3Blcmx5IHN1cHBvcnQgb3J0aG9nb25hbCB3cml0aW5nIG1vZGUuCkBAIC04MjIsNyAr ODIyLDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjptaW5TaXplRm9yQ2hpbGQoUmVuZGVyQm94 JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW8KICAgICByZXR1cm4gY2hpbGQuY29tcHV0 ZUxvZ2ljYWxIZWlnaHRVc2luZyhNaW5TaXplLCBjaGlsZE1pblNpemUsIE51bGxvcHQpLnZhbHVl T3IoMCkgKyBjaGlsZC5tYXJnaW5Mb2dpY2FsSGVpZ2h0KCkgKyBjaGlsZC5zY3JvbGxiYXJMb2dp Y2FsSGVpZ2h0KCk7CiB9CiAKLWJvb2wgUmVuZGVyR3JpZDo6dXBkYXRlT3ZlcnJpZGVDb250YWlu aW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiBjaGlsZCwgR3Jp ZFNpemluZ0RhdGEmIHNpemluZ0RhdGEpCitib29sIFJlbmRlckdyaWQ6OnVwZGF0ZU92ZXJyaWRl Q29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxXaWR0aEZvckNoaWxkKFJlbmRlckJveCYgY2hp bGQsIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKSBjb25zdAogewogICAgIExheW91dFVuaXQg b3ZlcnJpZGVXaWR0aCA9IGdyaWRBcmVhQnJlYWR0aEZvckNoaWxkKGNoaWxkLCBGb3JDb2x1bW5z LCBzaXppbmdEYXRhLmNvbHVtblRyYWNrcyk7CiAgICAgaWYgKGNoaWxkLmhhc092ZXJyaWRlQ29u dGFpbmluZ0Jsb2NrTG9naWNhbFdpZHRoKCkgJiYgY2hpbGQub3ZlcnJpZGVDb250YWluaW5nQmxv Y2tDb250ZW50TG9naWNhbFdpZHRoKCkgPT0gb3ZlcnJpZGVXaWR0aCkKQEAgLTgzMiw3ICs4MzIs NyBAQCBib29sIFJlbmRlckdyaWQ6OnVwZGF0ZU92ZXJyaWRlQ29udGFpbmluZ0Jsb2NrQ29udGVu dExvZ2ljYWxXaWR0aEZvckNoaWxkKFJlbmRlcgogICAgIHJldHVybiB0cnVlOwogfQogCi1MYXlv dXRVbml0IFJlbmRlckdyaWQ6Om1pbkNvbnRlbnRGb3JDaGlsZChSZW5kZXJCb3gmIGNoaWxkLCBH cmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5n RGF0YSkKK0xheW91dFVuaXQgUmVuZGVyR3JpZDo6bWluQ29udGVudEZvckNoaWxkKFJlbmRlckJv eCYgY2hpbGQsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIEdyaWRTaXppbmdE YXRhJiBzaXppbmdEYXRhKSBjb25zdAogewogICAgIGJvb2wgaGFzT3J0aG9nb25hbFdyaXRpbmdN b2RlID0gY2hpbGQuaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSAhPSBpc0hvcml6b250YWxXcml0 aW5nTW9kZSgpOwogICAgIC8vIEZJWE1FOiBQcm9wZXJseSBzdXBwb3J0IG9ydGhvZ29uYWwgd3Jp dGluZyBtb2RlLgpAQCAtODU1LDcgKzg1NSw3IEBAIExheW91dFVuaXQgUmVuZGVyR3JpZDo6bWlu Q29udGVudEZvckNoaWxkKFJlbmRlckJveCYgY2hpbGQsIEdyaWRUcmFja1NpemluZ0RpcmVjCiAg ICAgcmV0dXJuIGxvZ2ljYWxIZWlnaHRGb3JDaGlsZChjaGlsZCwgc2l6aW5nRGF0YSk7CiB9CiAK LUxheW91dFVuaXQgUmVuZGVyR3JpZDo6bWF4Q29udGVudEZvckNoaWxkKFJlbmRlckJveCYgY2hp bGQsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJiBz aXppbmdEYXRhKQorTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjptYXhDb250ZW50Rm9yQ2hpbGQoUmVu ZGVyQm94JiBjaGlsZCwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNp emluZ0RhdGEmIHNpemluZ0RhdGEpIGNvbnN0CiB7CiAgICAgYm9vbCBoYXNPcnRob2dvbmFsV3Jp dGluZ01vZGUgPSBjaGlsZC5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICE9IGlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKCk7CiAgICAgLy8gRklYTUU6IFByb3Blcmx5IHN1cHBvcnQgb3J0aG9nb25h bCB3cml0aW5nIG1vZGUuCkBAIC05MTUsNyArOTE1LDcgQEAgc3RydWN0IEdyaWRJdGVtc1NwYW5H cm91cFJhbmdlIHsKICAgICBWZWN0b3I8R3JpZEl0ZW1XaXRoU3Bhbj46Oml0ZXJhdG9yIHJhbmdl RW5kOwogfTsKIAotdm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXpp bmdGdW5jdGlvbnMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uIGRpcmVjdGlvbiwgR3JpZFNpemlu Z0RhdGEmIHNpemluZ0RhdGEpCit2b2lkIFJlbmRlckdyaWQ6OnJlc29sdmVDb250ZW50QmFzZWRU cmFja1NpemluZ0Z1bmN0aW9ucyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBH cmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkgY29uc3QKIHsKICAgICBzaXppbmdEYXRhLml0ZW1z U29ydGVkQnlJbmNyZWFzaW5nU3Bhbi5zaHJpbmsoMCk7CiAgICAgSGFzaFNldDxSZW5kZXJCb3gq PiBpdGVtc1NldDsKQEAgLTk1Niw3ICs5NTYsNyBAQCB2b2lkIFJlbmRlckdyaWQ6OnJlc29sdmVD b250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9ucyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpbwog ICAgIH0KIH0KIAotdm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXpp bmdGdW5jdGlvbnNGb3JOb25TcGFubmluZ0l0ZW1zKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBk aXJlY3Rpb24sIGNvbnN0IEdyaWRTcGFuJiBzcGFuLCBSZW5kZXJCb3gmIGdyaWRJdGVtLCBHcmlk VHJhY2smIHRyYWNrLCBHcmlkU2l6aW5nRGF0YSYgc2l6aW5nRGF0YSkKK3ZvaWQgUmVuZGVyR3Jp ZDo6cmVzb2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25zRm9yTm9uU3Bhbm5pbmdJ dGVtcyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBjb25zdCBHcmlkU3BhbiYg c3BhbiwgUmVuZGVyQm94JiBncmlkSXRlbSwgR3JpZFRyYWNrJiB0cmFjaywgR3JpZFNpemluZ0Rh dGEmIHNpemluZ0RhdGEpIGNvbnN0CiB7CiAgICAgdW5zaWduZWQgdHJhY2tQb3NpdGlvbiA9IHNw YW4uc3RhcnRMaW5lKCk7CiAgICAgR3JpZFRyYWNrU2l6ZSB0cmFja1NpemUgPSBncmlkVHJhY2tT aXplKGRpcmVjdGlvbiwgdHJhY2tQb3NpdGlvbiwgc2l6aW5nRGF0YS5zaXppbmdPcGVyYXRpb24p OwpAQCAtMTA3Niw3ICsxMDc2LDcgQEAgdm9pZCBSZW5kZXJHcmlkOjp1cGRhdGVUcmFja1NpemVG b3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6ZUNvbXB1dGF0aW8KICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJHcmlkOjpjdXJyZW50SXRl bVNpemVGb3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhh c2UgcGhhc2UsIFJlbmRlckJveCYgZ3JpZEl0ZW0sIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiBk aXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKQorTGF5b3V0VW5pdCBSZW5kZXJH cmlkOjpjdXJyZW50SXRlbVNpemVGb3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6 ZUNvbXB1dGF0aW9uUGhhc2UgcGhhc2UsIFJlbmRlckJveCYgZ3JpZEl0ZW0sIEdyaWRUcmFja1Np emluZ0RpcmVjdGlvbiBkaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJiBzaXppbmdEYXRhKSBjb25z dAogewogICAgIHN3aXRjaCAocGhhc2UpIHsKICAgICBjYXNlIFJlc29sdmVJbnRyaW5zaWNNaW5p bXVtczoKQEAgLTEwOTcsNyArMTA5Nyw3IEBAIExheW91dFVuaXQgUmVuZGVyR3JpZDo6Y3VycmVu dEl0ZW1TaXplRm9yVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZShUcmFja1NpemVDb21wCiB9CiAK IHRlbXBsYXRlIDxSZW5kZXJHcmlkOjpUcmFja1NpemVDb21wdXRhdGlvblBoYXNlIHBoYXNlPgot dm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnNG b3JJdGVtcyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0 YSYgc2l6aW5nRGF0YSwgY29uc3QgR3JpZEl0ZW1zU3Bhbkdyb3VwUmFuZ2UmIGdyaWRJdGVtc1dp dGhTcGFuKQordm9pZCBSZW5kZXJHcmlkOjpyZXNvbHZlQ29udGVudEJhc2VkVHJhY2tTaXppbmdG dW5jdGlvbnNGb3JJdGVtcyhHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24gZGlyZWN0aW9uLCBHcmlk U2l6aW5nRGF0YSYgc2l6aW5nRGF0YSwgY29uc3QgR3JpZEl0ZW1zU3Bhbkdyb3VwUmFuZ2UmIGdy aWRJdGVtc1dpdGhTcGFuKSBjb25zdAogewogICAgIFZlY3RvcjxHcmlkVHJhY2s+JiB0cmFja3Mg PSAoZGlyZWN0aW9uID09IEZvckNvbHVtbnMpID8gc2l6aW5nRGF0YS5jb2x1bW5UcmFja3MgOiBz aXppbmdEYXRhLnJvd1RyYWNrczsKICAgICBmb3IgKGNvbnN0IGF1dG8mIHRyYWNrSW5kZXggOiBz aXppbmdEYXRhLmNvbnRlbnRTaXplZFRyYWNrc0luZGV4KSB7CkBAIC0xMTU4LDcgKzExNTgsNyBA QCBzdGF0aWMgYm9vbCBzb3J0QnlHcmlkVHJhY2tHcm93dGhQb3RlbnRpYWwoY29uc3QgR3JpZFRy YWNrKiB0cmFjazEsIGNvbnN0IEdyaWRUcgogfQogCiB0ZW1wbGF0ZSA8UmVuZGVyR3JpZDo6VHJh Y2tTaXplQ29tcHV0YXRpb25QaGFzZSBwaGFzZT4KLXZvaWQgUmVuZGVyR3JpZDo6ZGlzdHJpYnV0 ZVNwYWNlVG9UcmFja3MoVmVjdG9yPEdyaWRUcmFjayo+JiB0cmFja3MsIGNvbnN0IFZlY3RvcjxH cmlkVHJhY2sqPiogZ3Jvd0JleW9uZEdyb3d0aExpbWl0c1RyYWNrcywgTGF5b3V0VW5pdCYgZnJl ZVNwYWNlKQordm9pZCBSZW5kZXJHcmlkOjpkaXN0cmlidXRlU3BhY2VUb1RyYWNrcyhWZWN0b3I8 R3JpZFRyYWNrKj4mIHRyYWNrcywgY29uc3QgVmVjdG9yPEdyaWRUcmFjayo+KiBncm93QmV5b25k R3Jvd3RoTGltaXRzVHJhY2tzLCBMYXlvdXRVbml0JiBmcmVlU3BhY2UpIGNvbnN0CiB7CiAgICAg QVNTRVJUKGZyZWVTcGFjZSA+PSAwKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckdyaWQuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJHcmlk LmgKaW5kZXggZTFkMTA3MzJmNjM5ZTk5ODE0ODk0ZWMwNDJhN2QzNWIyNzllMjkwNS4uNTM3ZDQ2 ODg0MTYwMDQ5MDA2NWU2OTMwZjMyNDk4ODlmMWEzNjA0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckdyaWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyR3JpZC5oCkBAIC03NSwxMCArNzUsMTAgQEAgcHJpdmF0ZToKICAgICBjbGFzcyBH cmlkSXRlcmF0b3I7CiAgICAgY2xhc3MgR3JpZFNpemluZ0RhdGE7CiAgICAgZW51bSBTaXppbmdP cGVyYXRpb24geyBUcmFja1NpemluZywgSW50cmluc2ljU2l6ZUNvbXB1dGF0aW9uIH07Ci0gICAg dm9pZCBjb21wdXRlVXNlZEJyZWFkdGhPZkdyaWRUcmFja3MoR3JpZFRyYWNrU2l6aW5nRGlyZWN0 aW9uLCBHcmlkU2l6aW5nRGF0YSYsIExheW91dFVuaXQmIGJhc2VTaXplc1dpdGhvdXRNYXhpbWl6 YXRpb24sIExheW91dFVuaXQmIGdyb3d0aExpbWl0c1dpdGhvdXRNYXhpbWl6YXRpb24pOworICAg IHZvaWQgY29tcHV0ZVVzZWRCcmVhZHRoT2ZHcmlkVHJhY2tzKEdyaWRUcmFja1NpemluZ0RpcmVj dGlvbiwgR3JpZFNpemluZ0RhdGEmLCBMYXlvdXRVbml0JiBiYXNlU2l6ZXNXaXRob3V0TWF4aW1p emF0aW9uLCBMYXlvdXRVbml0JiBncm93dGhMaW1pdHNXaXRob3V0TWF4aW1pemF0aW9uKSBjb25z dDsKICAgICBMYXlvdXRVbml0IGNvbXB1dGVVc2VkQnJlYWR0aE9mTWluTGVuZ3RoKGNvbnN0IEdy aWRMZW5ndGgmLCBMYXlvdXRVbml0IG1heFNpemUpIGNvbnN0OwogICAgIExheW91dFVuaXQgY29t cHV0ZVVzZWRCcmVhZHRoT2ZNYXhMZW5ndGgoY29uc3QgR3JpZExlbmd0aCYsIExheW91dFVuaXQg dXNlZEJyZWFkdGgsIExheW91dFVuaXQgbWF4U2l6ZSkgY29uc3Q7Ci0gICAgdm9pZCByZXNvbHZl Q29udGVudEJhc2VkVHJhY2tTaXppbmdGdW5jdGlvbnMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9u LCBHcmlkU2l6aW5nRGF0YSYpOworICAgIHZvaWQgcmVzb2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6 aW5nRnVuY3Rpb25zKEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmKSBj b25zdDsKIAogICAgIHZvaWQgZW5zdXJlR3JpZFNpemUodW5zaWduZWQgbWF4aW11bVJvd1NpemUs IHVuc2lnbmVkIG1heGltdW1Db2x1bW5TaXplKTsKICAgICB2b2lkIGluc2VydEl0ZW1JbnRvR3Jp ZChSZW5kZXJCb3gmLCBjb25zdCBHcmlkQXJlYSYpOwpAQCAtMTI0LDEyICsxMjQsMTIgQEAgcHJp dmF0ZToKICAgICBzdGF0aWMgYm9vbCB0cmFja1Nob3VsZEdyb3dCZXlvbmRHcm93dGhMaW1pdHNG b3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UsIGNv bnN0IEdyaWRUcmFja1NpemUmKTsKICAgICBzdGF0aWMgdm9pZCBtYXJrQXNJbmZpbml0ZWx5R3Jv d2FibGVGb3JUcmFja1NpemVDb21wdXRhdGlvblBoYXNlKFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhh c2UsIEdyaWRUcmFjayYpOwogICAgIHN0YXRpYyB2b2lkIHVwZGF0ZVRyYWNrU2l6ZUZvclRyYWNr U2l6ZUNvbXB1dGF0aW9uUGhhc2UoVHJhY2tTaXplQ29tcHV0YXRpb25QaGFzZSwgR3JpZFRyYWNr Jik7Ci0gICAgTGF5b3V0VW5pdCBjdXJyZW50SXRlbVNpemVGb3JUcmFja1NpemVDb21wdXRhdGlv blBoYXNlKFRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UsIFJlbmRlckJveCYsIEdyaWRUcmFja1Np emluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmKTsKKyAgICBMYXlvdXRVbml0IGN1cnJlbnRJ dGVtU2l6ZUZvclRyYWNrU2l6ZUNvbXB1dGF0aW9uUGhhc2UoVHJhY2tTaXplQ29tcHV0YXRpb25Q aGFzZSwgUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0 YSYpIGNvbnN0OwogCiAgICAgdHlwZWRlZiBzdHJ1Y3QgR3JpZEl0ZW1zU3Bhbkdyb3VwUmFuZ2Ug R3JpZEl0ZW1zU3Bhbkdyb3VwUmFuZ2U7Ci0gICAgdm9pZCByZXNvbHZlQ29udGVudEJhc2VkVHJh Y2tTaXppbmdGdW5jdGlvbnNGb3JOb25TcGFubmluZ0l0ZW1zKEdyaWRUcmFja1NpemluZ0RpcmVj dGlvbiwgY29uc3QgR3JpZFNwYW4mLCBSZW5kZXJCb3gmIGdyaWRJdGVtLCBHcmlkVHJhY2smLCBH cmlkU2l6aW5nRGF0YSYpOwotICAgIHRlbXBsYXRlIDxUcmFja1NpemVDb21wdXRhdGlvblBoYXNl PiB2b2lkIHJlc29sdmVDb250ZW50QmFzZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvckl0ZW1zKEdy aWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmLCBjb25zdCBHcmlkSXRlbXNT cGFuR3JvdXBSYW5nZSYpOwotICAgIHRlbXBsYXRlIDxUcmFja1NpemVDb21wdXRhdGlvblBoYXNl PiB2b2lkIGRpc3RyaWJ1dGVTcGFjZVRvVHJhY2tzKFZlY3RvcjxHcmlkVHJhY2sqPiYsIGNvbnN0 IFZlY3RvcjxHcmlkVHJhY2sqPiogZ3Jvd0JleW9uZEdyb3d0aExpbWl0c1RyYWNrcywgTGF5b3V0 VW5pdCYgYXZhaWxhYmxlTG9naWNhbFNwYWNlKTsKKyAgICB2b2lkIHJlc29sdmVDb250ZW50QmFz ZWRUcmFja1NpemluZ0Z1bmN0aW9uc0Zvck5vblNwYW5uaW5nSXRlbXMoR3JpZFRyYWNrU2l6aW5n RGlyZWN0aW9uLCBjb25zdCBHcmlkU3BhbiYsIFJlbmRlckJveCYgZ3JpZEl0ZW0sIEdyaWRUcmFj ayYsIEdyaWRTaXppbmdEYXRhJikgY29uc3Q7CisgICAgdGVtcGxhdGUgPFRyYWNrU2l6ZUNvbXB1 dGF0aW9uUGhhc2U+IHZvaWQgcmVzb2x2ZUNvbnRlbnRCYXNlZFRyYWNrU2l6aW5nRnVuY3Rpb25z Rm9ySXRlbXMoR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBHcmlkU2l6aW5nRGF0YSYsIGNvbnN0 IEdyaWRJdGVtc1NwYW5Hcm91cFJhbmdlJikgY29uc3Q7CisgICAgdGVtcGxhdGUgPFRyYWNrU2l6 ZUNvbXB1dGF0aW9uUGhhc2U+IHZvaWQgZGlzdHJpYnV0ZVNwYWNlVG9UcmFja3MoVmVjdG9yPEdy aWRUcmFjayo+JiwgY29uc3QgVmVjdG9yPEdyaWRUcmFjayo+KiBncm93QmV5b25kR3Jvd3RoTGlt aXRzVHJhY2tzLCBMYXlvdXRVbml0JiBhdmFpbGFibGVMb2dpY2FsU3BhY2UpIGNvbnN0OwogCiAg ICAgdHlwZWRlZiBIYXNoU2V0PHVuc2lnbmVkLCBEZWZhdWx0SGFzaDx1bnNpZ25lZD46Okhhc2gs IFdURjo6VW5zaWduZWRXaXRoWmVyb0tleUhhc2hUcmFpdHM8dW5zaWduZWQ+PiBUcmFja0luZGV4 U2V0OwogICAgIGRvdWJsZSBjb21wdXRlRmxleEZhY3RvclVuaXRTaXplKGNvbnN0IFZlY3RvcjxH cmlkVHJhY2s+JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9uLCBTaXppbmdPcGVyYXRpb24sIGRv dWJsZSBmbGV4RmFjdG9yU3VtLCBMYXlvdXRVbml0IGxlZnRPdmVyU3BhY2UsIGNvbnN0IFZlY3Rv cjx1bnNpZ25lZCwgOD4mIGZsZXhpYmxlVHJhY2tzSW5kZXhlcywgc3RkOjp1bmlxdWVfcHRyPFRy YWNrSW5kZXhTZXQ+IHRyYWNrc1RvVHJlYXRBc0luZmxleGlibGUgPSBudWxscHRyKSBjb25zdDsK QEAgLTEzOCwxMSArMTM4LDExIEBAIHByaXZhdGU6CiAgICAgY29uc3QgR3JpZFRyYWNrU2l6ZSYg cmF3R3JpZFRyYWNrU2l6ZShHcmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIHVuc2lnbmVkKSBjb25z dDsKICAgICBHcmlkVHJhY2tTaXplIGdyaWRUcmFja1NpemUoR3JpZFRyYWNrU2l6aW5nRGlyZWN0 aW9uLCB1bnNpZ25lZCwgU2l6aW5nT3BlcmF0aW9uKSBjb25zdDsKIAotICAgIGJvb2wgdXBkYXRl T3ZlcnJpZGVDb250YWluaW5nQmxvY2tDb250ZW50TG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVy Qm94JiwgR3JpZFNpemluZ0RhdGEmKTsKLSAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRGb3JD aGlsZChSZW5kZXJCb3gmLCBHcmlkU2l6aW5nRGF0YSYpOwotICAgIExheW91dFVuaXQgbWluU2l6 ZUZvckNoaWxkKFJlbmRlckJveCYsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemlu Z0RhdGEmKTsKLSAgICBMYXlvdXRVbml0IG1pbkNvbnRlbnRGb3JDaGlsZChSZW5kZXJCb3gmLCBH cmlkVHJhY2tTaXppbmdEaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJik7Ci0gICAgTGF5b3V0VW5p dCBtYXhDb250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0aW9u LCBHcmlkU2l6aW5nRGF0YSYpOworICAgIGJvb2wgdXBkYXRlT3ZlcnJpZGVDb250YWluaW5nQmxv Y2tDb250ZW50TG9naWNhbFdpZHRoRm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFNpemluZ0RhdGEm KSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRGb3JDaGlsZChSZW5kZXJCb3gm LCBHcmlkU2l6aW5nRGF0YSYpIGNvbnN0OworICAgIExheW91dFVuaXQgbWluU2l6ZUZvckNoaWxk KFJlbmRlckJveCYsIEdyaWRUcmFja1NpemluZ0RpcmVjdGlvbiwgR3JpZFNpemluZ0RhdGEmKSBj b25zdDsKKyAgICBMYXlvdXRVbml0IG1pbkNvbnRlbnRGb3JDaGlsZChSZW5kZXJCb3gmLCBHcmlk VHJhY2tTaXppbmdEaXJlY3Rpb24sIEdyaWRTaXppbmdEYXRhJikgY29uc3Q7CisgICAgTGF5b3V0 VW5pdCBtYXhDb250ZW50Rm9yQ2hpbGQoUmVuZGVyQm94JiwgR3JpZFRyYWNrU2l6aW5nRGlyZWN0 aW9uLCBHcmlkU2l6aW5nRGF0YSYpIGNvbnN0OwogICAgIEdyaWRBeGlzUG9zaXRpb24gY29sdW1u QXhpc1Bvc2l0aW9uRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JikgY29uc3Q7CiAgICAgR3JpZEF4 aXNQb3NpdGlvbiByb3dBeGlzUG9zaXRpb25Gb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmKSBjb25z dDsKICAgICBMYXlvdXRVbml0IGNvbHVtbkF4aXNPZmZzZXRGb3JDaGlsZChjb25zdCBSZW5kZXJC b3gmKSBjb25zdDsK