138594 2014-11-10 19:39:28 -0800 Move 'border-image-*' / '-webkit-mask-box-image-*' CSS properties to the new StyleBuilder 2014-11-11 17:51:44 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez commit-queue kling koivisto oldest_to_newest 1047730 0 cdumez 2014-11-10 19:39:28 -0800 Move 'border-image-*' / '-webkit-mask-box-image-*' CSS properties to the new StyleBuilder 1047733 1 241327 cdumez 2014-11-10 19:59:09 -0800 Created attachment 241327 Patch 1048040 2 241397 cdumez 2014-11-11 17:11:16 -0800 Created attachment 241397 Patch 1048054 3 241397 commit-queue 2014-11-11 17:51:40 -0800 Comment on attachment 241397 Patch Clearing flags on attachment: 241397 Committed r175997: <http://trac.webkit.org/changeset/175997> 1048055 4 commit-queue 2014-11-11 17:51:44 -0800 All reviewed patches have been landed. Closing bug. 241327 2014-11-10 19:59:09 -0800 2014-11-11 17:11:12 -0800 Patch bug-138594-20141110195911.patch text/plain 16738 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1ODQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTYwMmYyNzI4ODgwZmVi YjgwNjAzMGZhNzk5NGUwODhiNTBhYWI0MS4uY2E5ZGZmM2UxZTAyYTQzOTRhMDcyMmY5MTlkNTA0 YWQzMjdkMzcxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTExLTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnYm9yZGVyLWltYWdl LSonIC8gJy13ZWJraXQtbWFzay1ib3gtaW1hZ2UtKicgQ1NTIHByb3BlcnRpZXMgdG8gdGhlIG5l dyBTdHlsZUJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzODU5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE1vdmUgJ2JvcmRlci1pbWFnZS0qJyAvICctd2Via2l0LW1hc2stYm94LWltYWdlLSon IENTUyBwcm9wZXJ0aWVzIGZyb20KKyAgICAgICAgRGVwcmVjYXRlZFN0eWxlQnVpbGRlciB0byB0 aGUgbmV3IFN0eWxlQnVpbGRlciB1c2luZyBjdXN0b20gY29kZS4KKworICAgICAgICBObyBuZXcg dGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0eU5h bWVzLmluOgorICAgICAgICAqIGNzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxk ZXIpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI6 OmdldFZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlCb3Jk ZXJJbWFnZU1vZGlmaWVyOjpzZXRWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpB cHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjo6YXBwbHlJbmhlcml0VmFsdWUpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI6 OmFwcGx5SW5pdGlhbFZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyOjphcHBseVZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyOjpjcmVhdGVIYW5kbGVy KTogRGVsZXRlZC4KKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJGdW5jdGlvbnM6OkFwcGx5UHJvcGVydHlCb3JkZXJJbWFn ZU1vZGlmaWVyOjphcHBseUluaGVyaXRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1 aWxkZXJGdW5jdGlvbnM6OkFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyOjphcHBseUlu aXRpYWxWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJGdW5jdGlvbnM6OkFw cGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyOjphcHBseVZhbHVlKToKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlQnVpbGRlckZ1bmN0aW9uczo6QXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9k aWZpZXI6OmdldFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckZ1bmN0aW9u czo6QXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI6OnNldFZhbHVlKToKKwogMjAxNC0x MS0xMCAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFVzZSBzdGQ6OnVuaXF1ZV9wdHI8PiBhbmQgc3RkOjptYWtlX3VuaXF1ZTw+IGluIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KaW5kZXggNWJhMDc5MzJlZmEzYTRk Yzk3NWVlYTQ3ZDYwNzA5ODNkYTcwM2JkOS4uNzEyYzJmZTNmMjFlMGI0MGNhMTFjOGVjZWQzZGNj NDE3ZjA0MWYxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFt ZXMuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KQEAgLTEx MiwxMSArMTEyLDExIEBAIGJvcmRlci1ib3R0b20td2lkdGggW05ld1N0eWxlQnVpbGRlciwgSW5p dGlhbD1pbml0aWFsQm9yZGVyV2lkdGgsIENvbnZlcnRlcj1MaW5lCiBib3JkZXItY29sbGFwc2Ug W0luaGVyaXRlZCwgTmV3U3R5bGVCdWlsZGVyXQogYm9yZGVyLWNvbG9yCiBib3JkZXItaW1hZ2UK LWJvcmRlci1pbWFnZS1vdXRzZXQKLWJvcmRlci1pbWFnZS1yZXBlYXQKLWJvcmRlci1pbWFnZS1z bGljZQorYm9yZGVyLWltYWdlLW91dHNldCBbTmV3U3R5bGVCdWlsZGVyLCBDdXN0b209QWxsXQor Ym9yZGVyLWltYWdlLXJlcGVhdCBbTmV3U3R5bGVCdWlsZGVyLCBDdXN0b209QWxsXQorYm9yZGVy LWltYWdlLXNsaWNlIFtOZXdTdHlsZUJ1aWxkZXIsIEN1c3RvbT1BbGxdCiBib3JkZXItaW1hZ2Ut c291cmNlIFtOZXdTdHlsZUJ1aWxkZXIsIENvbnZlcnRlcj1Cb3JkZXJJbWFnZVNvdXJjZTxDU1NQ cm9wZXJ0eUJvcmRlckltYWdlU291cmNlPl0KLWJvcmRlci1pbWFnZS13aWR0aAorYm9yZGVyLWlt YWdlLXdpZHRoIFtOZXdTdHlsZUJ1aWxkZXIsIEN1c3RvbT1BbGxdCiBib3JkZXItbGVmdAogYm9y ZGVyLWxlZnQtY29sb3IKIGJvcmRlci1sZWZ0LXN0eWxlIFtOZXdTdHlsZUJ1aWxkZXIsIFR5cGVO YW1lPUVCb3JkZXJTdHlsZSwgSW5pdGlhbD1pbml0aWFsQm9yZGVyU3R5bGVdCkBAIC00MjUsMTEg KzQyNSwxMSBAQCBqdXN0aWZ5LWNvbnRlbnQgW05ld1N0eWxlQnVpbGRlcl0KIC13ZWJraXQtbWFy cXVlZS1zdHlsZSBbTmV3U3R5bGVCdWlsZGVyLCBUeXBlTmFtZT1FTWFycXVlZUJlaGF2aW9yLCBO YW1lRm9yTWV0aG9kcz1NYXJxdWVlQmVoYXZpb3JdCiAtd2Via2l0LW1hc2sKIC13ZWJraXQtbWFz ay1ib3gtaW1hZ2UgW05ld1N0eWxlQnVpbGRlciwgSW5pdGlhbD1pbml0aWFsTmluZVBpZWNlSW1h Z2UsIENvbnZlcnRlcj1Cb3JkZXJNYXNrPENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlPl0K LS13ZWJraXQtbWFzay1ib3gtaW1hZ2Utb3V0c2V0Ci0td2Via2l0LW1hc2stYm94LWltYWdlLXJl cGVhdAotLXdlYmtpdC1tYXNrLWJveC1pbWFnZS1zbGljZQorLXdlYmtpdC1tYXNrLWJveC1pbWFn ZS1vdXRzZXQgW05ld1N0eWxlQnVpbGRlciwgQ3VzdG9tPUFsbF0KKy13ZWJraXQtbWFzay1ib3gt aW1hZ2UtcmVwZWF0IFtOZXdTdHlsZUJ1aWxkZXIsIEN1c3RvbT1BbGxdCistd2Via2l0LW1hc2st Ym94LWltYWdlLXNsaWNlIFtOZXdTdHlsZUJ1aWxkZXIsIEN1c3RvbT1BbGxdCiAtd2Via2l0LW1h c2stYm94LWltYWdlLXNvdXJjZSBbTmV3U3R5bGVCdWlsZGVyLCBDb252ZXJ0ZXI9Qm9yZGVySW1h Z2VTb3VyY2U8Q1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2VTb3VyY2U+XQotLXdlYmtpdC1t YXNrLWJveC1pbWFnZS13aWR0aAorLXdlYmtpdC1tYXNrLWJveC1pbWFnZS13aWR0aCBbTmV3U3R5 bGVCdWlsZGVyLCBDdXN0b209QWxsXQogLXdlYmtpdC1tYXNrLWNsaXAKIC13ZWJraXQtbWFzay1j b21wb3NpdGUKIC13ZWJraXQtbWFzay1pbWFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Y3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJl Y2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IDJhMWI4YWNkZjE4NWUzNThkMDhkOTNlODU0N2U4 Y2ExZDkzMzgxZTAuLmE2ZDQ5NTNmZjE0MDU3M2FmMTZlYTg5MTFjOTMxNGQ1ZWRhMDU0YzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKQEAgLTc5 NCw4MSArNzk0LDYgQEAgcHVibGljOgogICAgIH0KIH07CiAKLWVudW0gQm9yZGVySW1hZ2VUeXBl IHsgQm9yZGVySW1hZ2UgPSAwLCBCb3JkZXJNYXNrIH07Ci1lbnVtIEJvcmRlckltYWdlTW9kaWZp ZXJUeXBlIHsgT3V0c2V0LCBSZXBlYXQsIFNsaWNlLCBXaWR0aCB9OwotdGVtcGxhdGUgPEJvcmRl ckltYWdlVHlwZSB0eXBlLCBCb3JkZXJJbWFnZU1vZGlmaWVyVHlwZSBtb2RpZmllcj4KLWNsYXNz IEFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyIHsKLXByaXZhdGU6Ci0gICAgc3RhdGlj IGlubGluZSBjb25zdCBOaW5lUGllY2VJbWFnZSYgZ2V0VmFsdWUoUmVuZGVyU3R5bGUqIHN0eWxl KSB7IHJldHVybiB0eXBlID09IEJvcmRlckltYWdlID8gc3R5bGUtPmJvcmRlckltYWdlKCkgOiBz dHlsZS0+bWFza0JveEltYWdlKCk7IH0KLSAgICBzdGF0aWMgaW5saW5lIHZvaWQgc2V0VmFsdWUo UmVuZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBOaW5lUGllY2VJbWFnZSYgdmFsdWUpIHsgcmV0dXJu IHR5cGUgPT0gQm9yZGVySW1hZ2UgPyBzdHlsZS0+c2V0Qm9yZGVySW1hZ2UodmFsdWUpIDogc3R5 bGUtPnNldE1hc2tCb3hJbWFnZSh2YWx1ZSk7IH0KLXB1YmxpYzoKLSAgICBzdGF0aWMgdm9pZCBh cHBseUluaGVyaXRWYWx1ZShDU1NQcm9wZXJ0eUlELCBTdHlsZVJlc29sdmVyKiBzdHlsZVJlc29s dmVyKQotICAgIHsKLSAgICAgICAgTmluZVBpZWNlSW1hZ2UgaW1hZ2UoZ2V0VmFsdWUoc3R5bGVS ZXNvbHZlci0+c3R5bGUoKSkpOwotICAgICAgICBzd2l0Y2ggKG1vZGlmaWVyKSB7Ci0gICAgICAg IGNhc2UgT3V0c2V0OgotICAgICAgICAgICAgaW1hZ2UuY29weU91dHNldEZyb20oZ2V0VmFsdWUo c3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKSkpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgIGNhc2UgUmVwZWF0OgotICAgICAgICAgICAgaW1hZ2UuY29weVJlcGVhdEZyb20oZ2V0VmFs dWUoc3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKSkpOwotICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgIGNhc2UgU2xpY2U6Ci0gICAgICAgICAgICBpbWFnZS5jb3B5SW1hZ2VTbGljZXNGcm9t KGdldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnBhcmVudFN0eWxlKCkpKTsKLSAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICBjYXNlIFdpZHRoOgotICAgICAgICAgICAgaW1hZ2UuY29weUJvcmRlclNs aWNlc0Zyb20oZ2V0VmFsdWUoc3R5bGVSZXNvbHZlci0+cGFyZW50U3R5bGUoKSkpOwotICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgICAgc2V0VmFsdWUoc3R5bGVSZXNvbHZlci0+ c3R5bGUoKSwgaW1hZ2UpOwotICAgIH0KLQotICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbFZh bHVlKENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIpCi0gICAgewot ICAgICAgICBOaW5lUGllY2VJbWFnZSBpbWFnZShnZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHls ZSgpKSk7Ci0gICAgICAgIHN3aXRjaCAobW9kaWZpZXIpIHsKLSAgICAgICAgY2FzZSBPdXRzZXQ6 Ci0gICAgICAgICAgICBpbWFnZS5zZXRPdXRzZXQoTGVuZ3RoQm94KDApKTsKLSAgICAgICAgICAg IGJyZWFrOwotICAgICAgICBjYXNlIFJlcGVhdDoKLSAgICAgICAgICAgIGltYWdlLnNldEhvcml6 b250YWxSdWxlKFN0cmV0Y2hJbWFnZVJ1bGUpOwotICAgICAgICAgICAgaW1hZ2Uuc2V0VmVydGlj YWxSdWxlKFN0cmV0Y2hJbWFnZVJ1bGUpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNh c2UgU2xpY2U6Ci0gICAgICAgICAgICAvLyBNYXNrcyBoYXZlIGEgZGlmZmVyZW50IGluaXRpYWwg dmFsdWUgZm9yIHNsaWNlcy4gUHJlc2VydmUgdGhlIHZhbHVlIG9mIDAgZm9yIGJhY2t3YXJkcyBj b21wYXRpYmlsaXR5LgotICAgICAgICAgICAgaW1hZ2Uuc2V0SW1hZ2VTbGljZXModHlwZSA9PSBC b3JkZXJJbWFnZSA/IExlbmd0aEJveChMZW5ndGgoMTAwLCBQZXJjZW50KSwgTGVuZ3RoKDEwMCwg UGVyY2VudCksIExlbmd0aCgxMDAsIFBlcmNlbnQpLCBMZW5ndGgoMTAwLCBQZXJjZW50KSkgOiBM ZW5ndGhCb3goKSk7Ci0gICAgICAgICAgICBpbWFnZS5zZXRGaWxsKGZhbHNlKTsKLSAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICBjYXNlIFdpZHRoOgotICAgICAgICAgICAgLy8gTWFza3MgaGF2 ZSBhIGRpZmZlcmVudCBpbml0aWFsIHZhbHVlIGZvciB3aWR0aHMuIFRoZXkgdXNlIGFuICdhdXRv JyB2YWx1ZSByYXRoZXIgdGhhbiB0cnlpbmcgdG8gZml0IHRvIHRoZSBib3JkZXIuCi0gICAgICAg ICAgICBpbWFnZS5zZXRCb3JkZXJTbGljZXModHlwZSA9PSBCb3JkZXJJbWFnZSA/IExlbmd0aEJv eChMZW5ndGgoMSwgUmVsYXRpdmUpLCBMZW5ndGgoMSwgUmVsYXRpdmUpLCBMZW5ndGgoMSwgUmVs YXRpdmUpLCBMZW5ndGgoMSwgUmVsYXRpdmUpKSA6IExlbmd0aEJveCgpKTsKLSAgICAgICAgICAg IGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxl KCksIGltYWdlKTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlKENTU1Byb3Bl cnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlKiB2YWx1ZSkKLSAg ICB7Ci0gICAgICAgIE5pbmVQaWVjZUltYWdlIGltYWdlKGdldFZhbHVlKHN0eWxlUmVzb2x2ZXIt PnN0eWxlKCkpKTsKLSAgICAgICAgc3dpdGNoIChtb2RpZmllcikgewotICAgICAgICBjYXNlIE91 dHNldDoKLSAgICAgICAgICAgIGltYWdlLnNldE91dHNldChzdHlsZVJlc29sdmVyLT5zdHlsZU1h cCgpLT5tYXBOaW5lUGllY2VJbWFnZVF1YWQoKnZhbHVlKSk7Ci0gICAgICAgICAgICBicmVhazsK LSAgICAgICAgY2FzZSBSZXBlYXQ6Ci0gICAgICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZU1h cCgpLT5tYXBOaW5lUGllY2VJbWFnZVJlcGVhdCgqdmFsdWUsIGltYWdlKTsKLSAgICAgICAgICAg IGJyZWFrOwotICAgICAgICBjYXNlIFNsaWNlOgotICAgICAgICAgICAgc3R5bGVSZXNvbHZlci0+ c3R5bGVNYXAoKS0+bWFwTmluZVBpZWNlSW1hZ2VTbGljZSgqdmFsdWUsIGltYWdlKTsKLSAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFdpZHRoOgotICAgICAgICAgICAgaW1hZ2Uuc2V0 Qm9yZGVyU2xpY2VzKHN0eWxlUmVzb2x2ZXItPnN0eWxlTWFwKCktPm1hcE5pbmVQaWVjZUltYWdl UXVhZCgqdmFsdWUpKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgIHNl dFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIGltYWdlKTsKLSAgICB9Ci0KLSAgICBzdGF0 aWMgUHJvcGVydHlIYW5kbGVyIGNyZWF0ZUhhbmRsZXIoKSB7IHJldHVybiBQcm9wZXJ0eUhhbmRs ZXIoJmFwcGx5SW5oZXJpdFZhbHVlLCAmYXBwbHlJbml0aWFsVmFsdWUsICZhcHBseVZhbHVlKTsg fQotfTsKLQogZW51bSBDb3VudGVyQmVoYXZpb3Ige0luY3JlbWVudCA9IDAsIFJlc2V0fTsKIHRl bXBsYXRlIDxDb3VudGVyQmVoYXZpb3IgY291bnRlckJlaGF2aW9yPgogY2xhc3MgQXBwbHlQcm9w ZXJ0eUNvdW50ZXIgewpAQCAtMTU3MCwxMCArMTQ5NSw2IEBAIERlcHJlY2F0ZWRTdHlsZUJ1aWxk ZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIoKQogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQ cm9wZXJ0eUJhY2tncm91bmRSZXBlYXRZLCBBcHBseVByb3BlcnR5RmlsbExheWVyPEVGaWxsUmVw ZWF0LCBDU1NQcm9wZXJ0eUJhY2tncm91bmRSZXBlYXRZLCBCYWNrZ3JvdW5kRmlsbExheWVyLCAm UmVuZGVyU3R5bGU6OmFjY2Vzc0JhY2tncm91bmRMYXllcnMsICZSZW5kZXJTdHlsZTo6YmFja2dy b3VuZExheWVycywgJkZpbGxMYXllcjo6aXNSZXBlYXRZU2V0LCAmRmlsbExheWVyOjpyZXBlYXRZ LCAmRmlsbExheWVyOjpzZXRSZXBlYXRZLCAmRmlsbExheWVyOjpjbGVhclJlcGVhdFksICZGaWxs TGF5ZXI6OmluaXRpYWxGaWxsUmVwZWF0WSwgJkNTU1RvU3R5bGVNYXA6Om1hcEZpbGxSZXBlYXRZ Pjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlC YWNrZ3JvdW5kU2l6ZSwgQXBwbHlQcm9wZXJ0eUZpbGxMYXllcjxGaWxsU2l6ZSwgQ1NTUHJvcGVy dHlCYWNrZ3JvdW5kU2l6ZSwgQmFja2dyb3VuZEZpbGxMYXllciwgJlJlbmRlclN0eWxlOjphY2Nl c3NCYWNrZ3JvdW5kTGF5ZXJzLCAmUmVuZGVyU3R5bGU6OmJhY2tncm91bmRMYXllcnMsICZGaWxs TGF5ZXI6OmlzU2l6ZVNldCwgJkZpbGxMYXllcjo6c2l6ZSwgJkZpbGxMYXllcjo6c2V0U2l6ZSwg JkZpbGxMYXllcjo6Y2xlYXJTaXplLCAmRmlsbExheWVyOjppbml0aWFsRmlsbFNpemUsICZDU1NU b1N0eWxlTWFwOjptYXBGaWxsU2l6ZT46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVy dHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyQm90dG9tQ29sb3IsIEFwcGx5UHJvcGVydHlDb2xv cjxOb0luaGVyaXRGcm9tUGFyZW50LCAmUmVuZGVyU3R5bGU6OmJvcmRlckJvdHRvbUNvbG9yLCAm UmVuZGVyU3R5bGU6OnNldEJvcmRlckJvdHRvbUNvbG9yLCAmUmVuZGVyU3R5bGU6OnNldFZpc2l0 ZWRMaW5rQm9yZGVyQm90dG9tQ29sb3IsICZSZW5kZXJTdHlsZTo6Y29sb3I+OjpjcmVhdGVIYW5k bGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlckltYWdlT3V0 c2V0LCBBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjxCb3JkZXJJbWFnZSwgT3V0c2V0 Pjo6Y3JlYXRlSGFuZGxlcigpKTsKLSAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlC b3JkZXJJbWFnZVJlcGVhdCwgQXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI8Qm9yZGVy SW1hZ2UsIFJlcGVhdD46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0gICAgc2V0UHJvcGVydHlIYW5kbGVy KENTU1Byb3BlcnR5Qm9yZGVySW1hZ2VTbGljZSwgQXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9k aWZpZXI8Qm9yZGVySW1hZ2UsIFNsaWNlPjo6Y3JlYXRlSGFuZGxlcigpKTsKLSAgICBzZXRQcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJJbWFnZVdpZHRoLCBBcHBseVByb3BlcnR5Qm9y ZGVySW1hZ2VNb2RpZmllcjxCb3JkZXJJbWFnZSwgV2lkdGg+OjpjcmVhdGVIYW5kbGVyKCkpOwog ICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlckxlZnRDb2xvciwgQXBwbHlQ cm9wZXJ0eUNvbG9yPE5vSW5oZXJpdEZyb21QYXJlbnQsICZSZW5kZXJTdHlsZTo6Ym9yZGVyTGVm dENvbG9yLCAmUmVuZGVyU3R5bGU6OnNldEJvcmRlckxlZnRDb2xvciwgJlJlbmRlclN0eWxlOjpz ZXRWaXNpdGVkTGlua0JvcmRlckxlZnRDb2xvciwgJlJlbmRlclN0eWxlOjpjb2xvcj46OmNyZWF0 ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyUmln aHRDb2xvciwgQXBwbHlQcm9wZXJ0eUNvbG9yPE5vSW5oZXJpdEZyb21QYXJlbnQsICZSZW5kZXJT dHlsZTo6Ym9yZGVyUmlnaHRDb2xvciwgJlJlbmRlclN0eWxlOjpzZXRCb3JkZXJSaWdodENvbG9y LCAmUmVuZGVyU3R5bGU6OnNldFZpc2l0ZWRMaW5rQm9yZGVyUmlnaHRDb2xvciwgJlJlbmRlclN0 eWxlOjpjb2xvcj46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENT U1Byb3BlcnR5Qm9yZGVyVG9wQ29sb3IsIEFwcGx5UHJvcGVydHlDb2xvcjxOb0luaGVyaXRGcm9t UGFyZW50LCAmUmVuZGVyU3R5bGU6OmJvcmRlclRvcENvbG9yLCAmUmVuZGVyU3R5bGU6OnNldEJv cmRlclRvcENvbG9yLCAmUmVuZGVyU3R5bGU6OnNldFZpc2l0ZWRMaW5rQm9yZGVyVG9wQ29sb3Is ICZSZW5kZXJTdHlsZTo6Y29sb3I+OjpjcmVhdGVIYW5kbGVyKCkpOwpAQCAtMTYyNywxMCArMTU0 OCw2IEBAIERlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIoKQog ICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEZvbnRWYXJpYW50TGlnYXR1 cmVzLCBBcHBseVByb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXM6OmNyZWF0ZUhhbmRsZXIoKSk7 CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TWFycXVlZVJlcGV0aXRp b24sIEFwcGx5UHJvcGVydHlNYXJxdWVlUmVwZXRpdGlvbjo6Y3JlYXRlSGFuZGxlcigpKTsKICAg ICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRNYXJxdWVlU3BlZWQsIEFwcGx5 UHJvcGVydHlNYXJxdWVlU3BlZWQ6OmNyZWF0ZUhhbmRsZXIoKSk7Ci0gICAgc2V0UHJvcGVydHlI YW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdlT3V0c2V0LCBBcHBseVByb3BlcnR5 Qm9yZGVySW1hZ2VNb2RpZmllcjxCb3JkZXJNYXNrLCBPdXRzZXQ+OjpjcmVhdGVIYW5kbGVyKCkp OwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJbWFnZVJl cGVhdCwgQXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI8Qm9yZGVyTWFzaywgUmVwZWF0 Pjo6Y3JlYXRlSGFuZGxlcigpKTsKLSAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlX ZWJraXRNYXNrQm94SW1hZ2VTbGljZSwgQXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI8 Qm9yZGVyTWFzaywgU2xpY2U+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFu ZGxlcihDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJbWFnZVdpZHRoLCBBcHBseVByb3BlcnR5Qm9y ZGVySW1hZ2VNb2RpZmllcjxCb3JkZXJNYXNrLCBXaWR0aD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAg ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TWFza0NsaXAsIEFwcGx5UHJv cGVydHlGaWxsTGF5ZXI8RUZpbGxCb3gsIENTU1Byb3BlcnR5V2Via2l0TWFza0NsaXAsIE1hc2tG aWxsTGF5ZXIsICZSZW5kZXJTdHlsZTo6YWNjZXNzTWFza0xheWVycywgJlJlbmRlclN0eWxlOjpt YXNrTGF5ZXJzLCAmRmlsbExheWVyOjppc0NsaXBTZXQsICZGaWxsTGF5ZXI6OmNsaXAsICZGaWxs TGF5ZXI6OnNldENsaXAsICZGaWxsTGF5ZXI6OmNsZWFyQ2xpcCwgJkZpbGxMYXllcjo6aW5pdGlh bEZpbGxDbGlwLCAmQ1NTVG9TdHlsZU1hcDo6bWFwRmlsbENsaXA+OjpjcmVhdGVIYW5kbGVyKCkp OwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdE1hc2tDb21wb3NpdGUs IEFwcGx5UHJvcGVydHlGaWxsTGF5ZXI8Q29tcG9zaXRlT3BlcmF0b3IsIENTU1Byb3BlcnR5V2Vi a2l0TWFza0NvbXBvc2l0ZSwgTWFza0ZpbGxMYXllciwgJlJlbmRlclN0eWxlOjphY2Nlc3NNYXNr TGF5ZXJzLCAmUmVuZGVyU3R5bGU6Om1hc2tMYXllcnMsICZGaWxsTGF5ZXI6OmlzQ29tcG9zaXRl U2V0LCAmRmlsbExheWVyOjpjb21wb3NpdGUsICZGaWxsTGF5ZXI6OnNldENvbXBvc2l0ZSwgJkZp bGxMYXllcjo6Y2xlYXJDb21wb3NpdGUsICZGaWxsTGF5ZXI6OmluaXRpYWxGaWxsQ29tcG9zaXRl LCAmQ1NTVG9TdHlsZU1hcDo6bWFwRmlsbENvbXBvc2l0ZT46OmNyZWF0ZUhhbmRsZXIoKSk7CiAg ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TWFza0ltYWdlLCBBcHBseVBy b3BlcnR5RmlsbExheWVyPFN0eWxlSW1hZ2UqLCBDU1NQcm9wZXJ0eVdlYmtpdE1hc2tJbWFnZSwg TWFza0ZpbGxMYXllciwgJlJlbmRlclN0eWxlOjphY2Nlc3NNYXNrTGF5ZXJzLCAmUmVuZGVyU3R5 bGU6Om1hc2tMYXllcnMsICZGaWxsTGF5ZXI6OmlzSW1hZ2VTZXQsICZGaWxsTGF5ZXI6OmltYWdl LCAmRmlsbExheWVyOjpzZXRJbWFnZSwgJkZpbGxMYXllcjo6Y2xlYXJJbWFnZSwgJkZpbGxMYXll cjo6aW5pdGlhbEZpbGxJbWFnZSwgJkNTU1RvU3R5bGVNYXA6Om1hcEZpbGxJbWFnZT46OmNyZWF0 ZUhhbmRsZXIoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVy Q3VzdG9tLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKaW5kZXgg OTc3OThkNWFkOWJjNzA3ZjNmNmEwODRlY2IyNDhkYmI0NTRjMGQ4OS4uMTMwYzQ4ZWNkMDQzMDM2 OTM4MDk4MWYzMjkwZGNlN2E1ZTU2NWVjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3Nz L1N0eWxlQnVpbGRlckN1c3RvbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxk ZXJDdXN0b20uaApAQCAtMzU0LDYgKzM1NCwxMTAgQEAgaW5saW5lIHZvaWQgYXBwbHlWYWx1ZVRl eHRJbmRlbnQoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQog I2VuZGlmCiB9CiAKK2VudW0gQm9yZGVySW1hZ2VUeXBlIHsgQm9yZGVySW1hZ2UsIFdlYmtpdE1h c2tCb3hJbWFnZSB9OworZW51bSBCb3JkZXJJbWFnZU1vZGlmaWVyVHlwZSB7IE91dHNldCwgUmVw ZWF0LCBTbGljZSwgV2lkdGggfTsKK3RlbXBsYXRlIDxCb3JkZXJJbWFnZVR5cGUgdHlwZSwgQm9y ZGVySW1hZ2VNb2RpZmllclR5cGUgbW9kaWZpZXI+CitjbGFzcyBBcHBseVByb3BlcnR5Qm9yZGVy SW1hZ2VNb2RpZmllciB7CitwdWJsaWM6CisgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0VmFs dWUoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlcikKKyAgICB7CisgICAgICAgIE5pbmVQaWVj ZUltYWdlIGltYWdlKGdldFZhbHVlKHN0eWxlUmVzb2x2ZXIuc3R5bGUoKSkpOworICAgICAgICBz d2l0Y2ggKG1vZGlmaWVyKSB7CisgICAgICAgIGNhc2UgT3V0c2V0OgorICAgICAgICAgICAgaW1h Z2UuY29weU91dHNldEZyb20oZ2V0VmFsdWUoc3R5bGVSZXNvbHZlci5wYXJlbnRTdHlsZSgpKSk7 CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBSZXBlYXQ6CisgICAgICAgICAgICBp bWFnZS5jb3B5UmVwZWF0RnJvbShnZXRWYWx1ZShzdHlsZVJlc29sdmVyLnBhcmVudFN0eWxlKCkp KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFNsaWNlOgorICAgICAgICAgICAg aW1hZ2UuY29weUltYWdlU2xpY2VzRnJvbShnZXRWYWx1ZShzdHlsZVJlc29sdmVyLnBhcmVudFN0 eWxlKCkpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdpZHRoOgorICAgICAg ICAgICAgaW1hZ2UuY29weUJvcmRlclNsaWNlc0Zyb20oZ2V0VmFsdWUoc3R5bGVSZXNvbHZlci5w YXJlbnRTdHlsZSgpKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBz ZXRWYWx1ZShzdHlsZVJlc29sdmVyLnN0eWxlKCksIGltYWdlKTsKKyAgICB9CisKKyAgICBzdGF0 aWMgdm9pZCBhcHBseUluaXRpYWxWYWx1ZShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKQor ICAgIHsKKyAgICAgICAgTmluZVBpZWNlSW1hZ2UgaW1hZ2UoZ2V0VmFsdWUoc3R5bGVSZXNvbHZl ci5zdHlsZSgpKSk7CisgICAgICAgIHN3aXRjaCAobW9kaWZpZXIpIHsKKyAgICAgICAgY2FzZSBP dXRzZXQ6CisgICAgICAgICAgICBpbWFnZS5zZXRPdXRzZXQoTGVuZ3RoQm94KDApKTsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFJlcGVhdDoKKyAgICAgICAgICAgIGltYWdlLnNl dEhvcml6b250YWxSdWxlKFN0cmV0Y2hJbWFnZVJ1bGUpOworICAgICAgICAgICAgaW1hZ2Uuc2V0 VmVydGljYWxSdWxlKFN0cmV0Y2hJbWFnZVJ1bGUpOworICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIGNhc2UgU2xpY2U6CisgICAgICAgICAgICAvLyBNYXNrcyBoYXZlIGEgZGlmZmVyZW50IGlu aXRpYWwgdmFsdWUgZm9yIHNsaWNlcy4gUHJlc2VydmUgdGhlIHZhbHVlIG9mIDAgZm9yIGJhY2t3 YXJkcyBjb21wYXRpYmlsaXR5LgorICAgICAgICAgICAgaW1hZ2Uuc2V0SW1hZ2VTbGljZXModHlw ZSA9PSBCb3JkZXJJbWFnZSA/IExlbmd0aEJveChMZW5ndGgoMTAwLCBQZXJjZW50KSwgTGVuZ3Ro KDEwMCwgUGVyY2VudCksIExlbmd0aCgxMDAsIFBlcmNlbnQpLCBMZW5ndGgoMTAwLCBQZXJjZW50 KSkgOiBMZW5ndGhCb3goKSk7CisgICAgICAgICAgICBpbWFnZS5zZXRGaWxsKGZhbHNlKTsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdpZHRoOgorICAgICAgICAgICAgLy8gTWFz a3MgaGF2ZSBhIGRpZmZlcmVudCBpbml0aWFsIHZhbHVlIGZvciB3aWR0aHMuIFRoZXkgdXNlIGFu ICdhdXRvJyB2YWx1ZSByYXRoZXIgdGhhbiB0cnlpbmcgdG8gZml0IHRvIHRoZSBib3JkZXIuCisg ICAgICAgICAgICBpbWFnZS5zZXRCb3JkZXJTbGljZXModHlwZSA9PSBCb3JkZXJJbWFnZSA/IExl bmd0aEJveChMZW5ndGgoMSwgUmVsYXRpdmUpLCBMZW5ndGgoMSwgUmVsYXRpdmUpLCBMZW5ndGgo MSwgUmVsYXRpdmUpLCBMZW5ndGgoMSwgUmVsYXRpdmUpKSA6IExlbmd0aEJveCgpKTsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXIu c3R5bGUoKSwgaW1hZ2UpOworICAgIH0KKworICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWUoU3R5 bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQorICAgIHsKKyAgICAg ICAgTmluZVBpZWNlSW1hZ2UgaW1hZ2UoZ2V0VmFsdWUoc3R5bGVSZXNvbHZlci5zdHlsZSgpKSk7 CisgICAgICAgIHN3aXRjaCAobW9kaWZpZXIpIHsKKyAgICAgICAgY2FzZSBPdXRzZXQ6CisgICAg ICAgICAgICBpbWFnZS5zZXRPdXRzZXQoc3R5bGVSZXNvbHZlci5zdHlsZU1hcCgpLT5tYXBOaW5l UGllY2VJbWFnZVF1YWQodmFsdWUpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNl IFJlcGVhdDoKKyAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGVNYXAoKS0+bWFwTmluZVBp ZWNlSW1hZ2VSZXBlYXQodmFsdWUsIGltYWdlKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICBjYXNlIFNsaWNlOgorICAgICAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZU1hcCgpLT5tYXBO aW5lUGllY2VJbWFnZVNsaWNlKHZhbHVlLCBpbWFnZSk7CisgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBXaWR0aDoKKyAgICAgICAgICAgIGltYWdlLnNldEJvcmRlclNsaWNlcyhzdHls ZVJlc29sdmVyLnN0eWxlTWFwKCktPm1hcE5pbmVQaWVjZUltYWdlUXVhZCh2YWx1ZSkpOworICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgc2V0VmFsdWUoc3R5bGVSZXNvbHZl ci5zdHlsZSgpLCBpbWFnZSk7CisgICAgfQorCitwcml2YXRlOgorICAgIHN0YXRpYyBpbmxpbmUg Y29uc3QgTmluZVBpZWNlSW1hZ2UmIGdldFZhbHVlKFJlbmRlclN0eWxlKiBzdHlsZSkKKyAgICB7 CisgICAgICAgIHJldHVybiB0eXBlID09IEJvcmRlckltYWdlID8gc3R5bGUtPmJvcmRlckltYWdl KCkgOiBzdHlsZS0+bWFza0JveEltYWdlKCk7CisgICAgfQorCisgICAgc3RhdGljIGlubGluZSB2 b2lkIHNldFZhbHVlKFJlbmRlclN0eWxlKiBzdHlsZSwgY29uc3QgTmluZVBpZWNlSW1hZ2UmIHZh bHVlKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHR5cGUgPT0gQm9yZGVySW1hZ2UgPyBzdHlsZS0+ c2V0Qm9yZGVySW1hZ2UodmFsdWUpIDogc3R5bGUtPnNldE1hc2tCb3hJbWFnZSh2YWx1ZSk7Cisg ICAgfQorfTsKKworI2RlZmluZSBERUZJTkVfQk9SREVSX0lNQUdFX01PRElGSUVSX0hBTkRMRVIo dHlwZSwgbW9kaWZpZXIpIFwKK2lubGluZSB2b2lkIGFwcGx5SW5oZXJpdCMjdHlwZSMjbW9kaWZp ZXIoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlcikgXAoreyBcCisgICAgQXBwbHlQcm9wZXJ0 eUJvcmRlckltYWdlTW9kaWZpZXI8dHlwZSwgbW9kaWZpZXI+OjphcHBseUluaGVyaXRWYWx1ZShz dHlsZVJlc29sdmVyKTsgXAorfSBcCitpbmxpbmUgdm9pZCBhcHBseUluaXRpYWwjI3R5cGUjI21v ZGlmaWVyKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpIFwKK3sgXAorICAgIEFwcGx5UHJv cGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyPHR5cGUsIG1vZGlmaWVyPjo6YXBwbHlJbml0aWFsVmFs dWUoc3R5bGVSZXNvbHZlcik7IFwKK30gXAoraW5saW5lIHZvaWQgYXBwbHlWYWx1ZSMjdHlwZSMj bW9kaWZpZXIoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKSBc Cit7IFwKKyAgICBBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjx0eXBlLCBtb2RpZmll cj46OmFwcGx5VmFsdWUoc3R5bGVSZXNvbHZlciwgdmFsdWUpOyBcCit9CisKK0RFRklORV9CT1JE RVJfSU1BR0VfTU9ESUZJRVJfSEFORExFUihCb3JkZXJJbWFnZSwgT3V0c2V0KQorREVGSU5FX0JP UkRFUl9JTUFHRV9NT0RJRklFUl9IQU5ETEVSKEJvcmRlckltYWdlLCBSZXBlYXQpCitERUZJTkVf Qk9SREVSX0lNQUdFX01PRElGSUVSX0hBTkRMRVIoQm9yZGVySW1hZ2UsIFNsaWNlKQorREVGSU5F X0JPUkRFUl9JTUFHRV9NT0RJRklFUl9IQU5ETEVSKEJvcmRlckltYWdlLCBXaWR0aCkKK0RFRklO RV9CT1JERVJfSU1BR0VfTU9ESUZJRVJfSEFORExFUihXZWJraXRNYXNrQm94SW1hZ2UsIE91dHNl dCkKK0RFRklORV9CT1JERVJfSU1BR0VfTU9ESUZJRVJfSEFORExFUihXZWJraXRNYXNrQm94SW1h Z2UsIFJlcGVhdCkKK0RFRklORV9CT1JERVJfSU1BR0VfTU9ESUZJRVJfSEFORExFUihXZWJraXRN YXNrQm94SW1hZ2UsIFNsaWNlKQorREVGSU5FX0JPUkRFUl9JTUFHRV9NT0RJRklFUl9IQU5ETEVS KFdlYmtpdE1hc2tCb3hJbWFnZSwgV2lkdGgpCisKIH0gLy8gbmFtZXNwYWNlIFN0eWxlQnVpbGRl ckZ1bmN0aW9ucwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 241397 2014-11-11 17:11:16 -0800 2014-11-11 17:51:40 -0800 Patch bug-138594-20141111171119.patch text/plain 16818 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1OTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDNkNTdlMDc1ZGFhYjhm NDk0ZDA4ZmE4MGQzNTVkZjNhMWFmYmM1OC4uMmM0MzJhNjQ5YmNjMDY3OTg2ODI3M2MyOTRiMDdi MzA0NjhkODQxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTExLTEwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnYm9yZGVyLWltYWdl LSonIC8gJy13ZWJraXQtbWFzay1ib3gtaW1hZ2UtKicgQ1NTIHByb3BlcnRpZXMgdG8gdGhlIG5l dyBTdHlsZUJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzODU5NAorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisg ICAgICAgIE1vdmUgJ2JvcmRlci1pbWFnZS0qJyAvICctd2Via2l0LW1hc2stYm94LWltYWdlLSon IENTUyBwcm9wZXJ0aWVzIGZyb20KKyAgICAgICAgRGVwcmVjYXRlZFN0eWxlQnVpbGRlciB0byB0 aGUgbmV3IFN0eWxlQnVpbGRlciB1c2luZyBjdXN0b20gY29kZS4KKworICAgICAgICBObyBuZXcg dGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0eU5h bWVzLmluOgorICAgICAgICAqIGNzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJlY2F0ZWRTdHlsZUJ1aWxk ZXIpOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI6 OmdldFZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlCb3Jk ZXJJbWFnZU1vZGlmaWVyOjpzZXRWYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpB cHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjo6YXBwbHlJbmhlcml0VmFsdWUpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI6 OmFwcGx5SW5pdGlhbFZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyOjphcHBseVZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyOjpjcmVhdGVIYW5kbGVy KTogRGVsZXRlZC4KKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJGdW5jdGlvbnM6OkFwcGx5UHJvcGVydHlCb3JkZXJJbWFn ZU1vZGlmaWVyOjphcHBseUluaGVyaXRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1 aWxkZXJGdW5jdGlvbnM6OkFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyOjphcHBseUlu aXRpYWxWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJGdW5jdGlvbnM6OkFw cGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyOjphcHBseVZhbHVlKToKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlQnVpbGRlckZ1bmN0aW9uczo6QXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9k aWZpZXI6OmdldFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckZ1bmN0aW9u czo6QXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI6OnNldFZhbHVlKToKKwogMjAxNC0x MS0xMSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBB ZGQgc3VwcG9ydCBmb3IgbWFpbHRvOiBsaW5rIGFjdGlvbiBtZW51cwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4gYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJvcGVydHlOYW1lcy5pbgppbmRleCA3NzVlZGZhYzMyYTIwNjY1YmNlZDI0NjdiZjRiZDlk ODI0NDY5ZWViLi40MTEwYTg5YjllODdhMWZiN2E3ZmMzYzc3MjNiNjhiNDMzZGEyMzcxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgpAQCAtMTEyLDExICsxMTIsMTEgQEAg Ym9yZGVyLWJvdHRvbS13aWR0aCBbTmV3U3R5bGVCdWlsZGVyLCBJbml0aWFsPWluaXRpYWxCb3Jk ZXJXaWR0aCwgQ29udmVydGVyPUxpbmUKIGJvcmRlci1jb2xsYXBzZSBbSW5oZXJpdGVkLCBOZXdT dHlsZUJ1aWxkZXJdCiBib3JkZXItY29sb3IKIGJvcmRlci1pbWFnZQotYm9yZGVyLWltYWdlLW91 dHNldAotYm9yZGVyLWltYWdlLXJlcGVhdAotYm9yZGVyLWltYWdlLXNsaWNlCitib3JkZXItaW1h Z2Utb3V0c2V0IFtOZXdTdHlsZUJ1aWxkZXIsIEN1c3RvbT1BbGxdCitib3JkZXItaW1hZ2UtcmVw ZWF0IFtOZXdTdHlsZUJ1aWxkZXIsIEN1c3RvbT1BbGxdCitib3JkZXItaW1hZ2Utc2xpY2UgW05l d1N0eWxlQnVpbGRlciwgQ3VzdG9tPUFsbF0KIGJvcmRlci1pbWFnZS1zb3VyY2UgW05ld1N0eWxl QnVpbGRlciwgQ29udmVydGVyPUJvcmRlckltYWdlU291cmNlPENTU1Byb3BlcnR5Qm9yZGVySW1h Z2VTb3VyY2U+XQotYm9yZGVyLWltYWdlLXdpZHRoCitib3JkZXItaW1hZ2Utd2lkdGggW05ld1N0 eWxlQnVpbGRlciwgQ3VzdG9tPUFsbF0KIGJvcmRlci1sZWZ0CiBib3JkZXItbGVmdC1jb2xvcgog Ym9yZGVyLWxlZnQtc3R5bGUgW05ld1N0eWxlQnVpbGRlciwgVHlwZU5hbWU9RUJvcmRlclN0eWxl LCBJbml0aWFsPWluaXRpYWxCb3JkZXJTdHlsZV0KQEAgLTQyNSwxMSArNDI1LDExIEBAIGp1c3Rp ZnktY29udGVudCBbTmV3U3R5bGVCdWlsZGVyXQogLXdlYmtpdC1tYXJxdWVlLXN0eWxlIFtOZXdT dHlsZUJ1aWxkZXIsIFR5cGVOYW1lPUVNYXJxdWVlQmVoYXZpb3IsIE5hbWVGb3JNZXRob2RzPU1h cnF1ZWVCZWhhdmlvcl0KIC13ZWJraXQtbWFzawogLXdlYmtpdC1tYXNrLWJveC1pbWFnZSBbTmV3 U3R5bGVCdWlsZGVyLCBJbml0aWFsPWluaXRpYWxOaW5lUGllY2VJbWFnZSwgQ29udmVydGVyPUJv cmRlck1hc2s8Q1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1hZ2U+XQotLXdlYmtpdC1tYXNrLWJv eC1pbWFnZS1vdXRzZXQKLS13ZWJraXQtbWFzay1ib3gtaW1hZ2UtcmVwZWF0Ci0td2Via2l0LW1h c2stYm94LWltYWdlLXNsaWNlCistd2Via2l0LW1hc2stYm94LWltYWdlLW91dHNldCBbTmV3U3R5 bGVCdWlsZGVyLCBDdXN0b209QWxsXQorLXdlYmtpdC1tYXNrLWJveC1pbWFnZS1yZXBlYXQgW05l d1N0eWxlQnVpbGRlciwgQ3VzdG9tPUFsbF0KKy13ZWJraXQtbWFzay1ib3gtaW1hZ2Utc2xpY2Ug W05ld1N0eWxlQnVpbGRlciwgQ3VzdG9tPUFsbF0KIC13ZWJraXQtbWFzay1ib3gtaW1hZ2Utc291 cmNlIFtOZXdTdHlsZUJ1aWxkZXIsIENvbnZlcnRlcj1Cb3JkZXJJbWFnZVNvdXJjZTxDU1NQcm9w ZXJ0eVdlYmtpdE1hc2tCb3hJbWFnZVNvdXJjZT5dCi0td2Via2l0LW1hc2stYm94LWltYWdlLXdp ZHRoCistd2Via2l0LW1hc2stYm94LWltYWdlLXdpZHRoIFtOZXdTdHlsZUJ1aWxkZXIsIEN1c3Rv bT1BbGxdCiAtd2Via2l0LW1hc2stY2xpcAogLXdlYmtpdC1tYXNrLWNvbXBvc2l0ZQogLXdlYmtp dC1tYXNrLWltYWdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0 eWxlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRl ci5jcHAKaW5kZXggNDI3MzJjN2I2MTdiOTI4NzE4NzRhYTEzZDRmMzJkMjlhMmM0MTUwMi4uODI5 YzUxOGM1MDdiODgxZmZjMDM3OTk0Nzc5MmU1MzcwZGRjMjJhMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcApAQCAtNzk0LDgxICs3OTQsNiBAQCBw dWJsaWM6CiAgICAgfQogfTsKIAotZW51bSBCb3JkZXJJbWFnZVR5cGUgeyBCb3JkZXJJbWFnZSA9 IDAsIEJvcmRlck1hc2sgfTsKLWVudW0gQm9yZGVySW1hZ2VNb2RpZmllclR5cGUgeyBPdXRzZXQs IFJlcGVhdCwgU2xpY2UsIFdpZHRoIH07Ci10ZW1wbGF0ZSA8Qm9yZGVySW1hZ2VUeXBlIHR5cGUs IEJvcmRlckltYWdlTW9kaWZpZXJUeXBlIG1vZGlmaWVyPgotY2xhc3MgQXBwbHlQcm9wZXJ0eUJv cmRlckltYWdlTW9kaWZpZXIgewotcHJpdmF0ZToKLSAgICBzdGF0aWMgaW5saW5lIGNvbnN0IE5p bmVQaWVjZUltYWdlJiBnZXRWYWx1ZShSZW5kZXJTdHlsZSogc3R5bGUpIHsgcmV0dXJuIHR5cGUg PT0gQm9yZGVySW1hZ2UgPyBzdHlsZS0+Ym9yZGVySW1hZ2UoKSA6IHN0eWxlLT5tYXNrQm94SW1h Z2UoKTsgfQotICAgIHN0YXRpYyBpbmxpbmUgdm9pZCBzZXRWYWx1ZShSZW5kZXJTdHlsZSogc3R5 bGUsIGNvbnN0IE5pbmVQaWVjZUltYWdlJiB2YWx1ZSkgeyByZXR1cm4gdHlwZSA9PSBCb3JkZXJJ bWFnZSA/IHN0eWxlLT5zZXRCb3JkZXJJbWFnZSh2YWx1ZSkgOiBzdHlsZS0+c2V0TWFza0JveElt YWdlKHZhbHVlKTsgfQotcHVibGljOgotICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5oZXJpdFZhbHVl KENTU1Byb3BlcnR5SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIpCi0gICAgewotICAg ICAgICBOaW5lUGllY2VJbWFnZSBpbWFnZShnZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHlsZSgp KSk7Ci0gICAgICAgIHN3aXRjaCAobW9kaWZpZXIpIHsKLSAgICAgICAgY2FzZSBPdXRzZXQ6Ci0g ICAgICAgICAgICBpbWFnZS5jb3B5T3V0c2V0RnJvbShnZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5w YXJlbnRTdHlsZSgpKSk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBSZXBlYXQ6 Ci0gICAgICAgICAgICBpbWFnZS5jb3B5UmVwZWF0RnJvbShnZXRWYWx1ZShzdHlsZVJlc29sdmVy LT5wYXJlbnRTdHlsZSgpKSk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBTbGlj ZToKLSAgICAgICAgICAgIGltYWdlLmNvcHlJbWFnZVNsaWNlc0Zyb20oZ2V0VmFsdWUoc3R5bGVS ZXNvbHZlci0+cGFyZW50U3R5bGUoKSkpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGNh c2UgV2lkdGg6Ci0gICAgICAgICAgICBpbWFnZS5jb3B5Qm9yZGVyU2xpY2VzRnJvbShnZXRWYWx1 ZShzdHlsZVJlc29sdmVyLT5wYXJlbnRTdHlsZSgpKSk7Ci0gICAgICAgICAgICBicmVhazsKLSAg ICAgICAgfQotICAgICAgICBzZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHlsZSgpLCBpbWFnZSk7 Ci0gICAgfQotCi0gICAgc3RhdGljIHZvaWQgYXBwbHlJbml0aWFsVmFsdWUoQ1NTUHJvcGVydHlJ RCwgU3R5bGVSZXNvbHZlciogc3R5bGVSZXNvbHZlcikKLSAgICB7Ci0gICAgICAgIE5pbmVQaWVj ZUltYWdlIGltYWdlKGdldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCkpKTsKLSAgICAgICAg c3dpdGNoIChtb2RpZmllcikgewotICAgICAgICBjYXNlIE91dHNldDoKLSAgICAgICAgICAgIGlt YWdlLnNldE91dHNldChMZW5ndGhCb3goMCkpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IGNhc2UgUmVwZWF0OgotICAgICAgICAgICAgaW1hZ2Uuc2V0SG9yaXpvbnRhbFJ1bGUoU3RyZXRj aEltYWdlUnVsZSk7Ci0gICAgICAgICAgICBpbWFnZS5zZXRWZXJ0aWNhbFJ1bGUoU3RyZXRjaElt YWdlUnVsZSk7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBTbGljZToKLSAgICAg ICAgICAgIC8vIE1hc2tzIGhhdmUgYSBkaWZmZXJlbnQgaW5pdGlhbCB2YWx1ZSBmb3Igc2xpY2Vz LiBQcmVzZXJ2ZSB0aGUgdmFsdWUgb2YgMCBmb3IgYmFja3dhcmRzIGNvbXBhdGliaWxpdHkuCi0g ICAgICAgICAgICBpbWFnZS5zZXRJbWFnZVNsaWNlcyh0eXBlID09IEJvcmRlckltYWdlID8gTGVu Z3RoQm94KExlbmd0aCgxMDAsIFBlcmNlbnQpLCBMZW5ndGgoMTAwLCBQZXJjZW50KSwgTGVuZ3Ro KDEwMCwgUGVyY2VudCksIExlbmd0aCgxMDAsIFBlcmNlbnQpKSA6IExlbmd0aEJveCgpKTsKLSAg ICAgICAgICAgIGltYWdlLnNldEZpbGwoZmFsc2UpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAg ICAgIGNhc2UgV2lkdGg6Ci0gICAgICAgICAgICAvLyBNYXNrcyBoYXZlIGEgZGlmZmVyZW50IGlu aXRpYWwgdmFsdWUgZm9yIHdpZHRocy4gVGhleSB1c2UgYW4gJ2F1dG8nIHZhbHVlIHJhdGhlciB0 aGFuIHRyeWluZyB0byBmaXQgdG8gdGhlIGJvcmRlci4KLSAgICAgICAgICAgIGltYWdlLnNldEJv cmRlclNsaWNlcyh0eXBlID09IEJvcmRlckltYWdlID8gTGVuZ3RoQm94KExlbmd0aCgxLCBSZWxh dGl2ZSksIExlbmd0aCgxLCBSZWxhdGl2ZSksIExlbmd0aCgxLCBSZWxhdGl2ZSksIExlbmd0aCgx LCBSZWxhdGl2ZSkpIDogTGVuZ3RoQm94KCkpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IH0KLSAgICAgICAgc2V0VmFsdWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSwgaW1hZ2UpOwotICAg IH0KLQotICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5bGVSZXNv bHZlciogc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUqIHZhbHVlKQotICAgIHsKLSAgICAgICAgTmlu ZVBpZWNlSW1hZ2UgaW1hZ2UoZ2V0VmFsdWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSkpOwotICAg ICAgICBzd2l0Y2ggKG1vZGlmaWVyKSB7Ci0gICAgICAgIGNhc2UgT3V0c2V0OgotICAgICAgICAg ICAgaW1hZ2Uuc2V0T3V0c2V0KHN0eWxlUmVzb2x2ZXItPnN0eWxlTWFwKCktPm1hcE5pbmVQaWVj ZUltYWdlUXVhZCgqdmFsdWUpKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIFJl cGVhdDoKLSAgICAgICAgICAgIHN0eWxlUmVzb2x2ZXItPnN0eWxlTWFwKCktPm1hcE5pbmVQaWVj ZUltYWdlUmVwZWF0KCp2YWx1ZSwgaW1hZ2UpOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg IGNhc2UgU2xpY2U6Ci0gICAgICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZU1hcCgpLT5tYXBO aW5lUGllY2VJbWFnZVNsaWNlKCp2YWx1ZSwgaW1hZ2UpOwotICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgIGNhc2UgV2lkdGg6Ci0gICAgICAgICAgICBpbWFnZS5zZXRCb3JkZXJTbGljZXMoc3R5 bGVSZXNvbHZlci0+c3R5bGVNYXAoKS0+bWFwTmluZVBpZWNlSW1hZ2VRdWFkKCp2YWx1ZSkpOwot ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLSAgICAgICAgc2V0VmFsdWUoc3R5bGVSZXNv bHZlci0+c3R5bGUoKSwgaW1hZ2UpOwotICAgIH0KLQotICAgIHN0YXRpYyBQcm9wZXJ0eUhhbmRs ZXIgY3JlYXRlSGFuZGxlcigpIHsgcmV0dXJuIFByb3BlcnR5SGFuZGxlcigmYXBwbHlJbmhlcml0 VmFsdWUsICZhcHBseUluaXRpYWxWYWx1ZSwgJmFwcGx5VmFsdWUpOyB9Ci19OwotCiBlbnVtIENv dW50ZXJCZWhhdmlvciB7SW5jcmVtZW50ID0gMCwgUmVzZXR9OwogdGVtcGxhdGUgPENvdW50ZXJC ZWhhdmlvciBjb3VudGVyQmVoYXZpb3I+CiBjbGFzcyBBcHBseVByb3BlcnR5Q291bnRlciB7CkBA IC0xNTM2LDEwICsxNDYxLDYgQEAgRGVwcmVjYXRlZFN0eWxlQnVpbGRlcjo6RGVwcmVjYXRlZFN0 eWxlQnVpbGRlcigpCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5QmFja2dyb3Vu ZFJlcGVhdFksIEFwcGx5UHJvcGVydHlGaWxsTGF5ZXI8RUZpbGxSZXBlYXQsIENTU1Byb3BlcnR5 QmFja2dyb3VuZFJlcGVhdFksIEJhY2tncm91bmRGaWxsTGF5ZXIsICZSZW5kZXJTdHlsZTo6YWNj ZXNzQmFja2dyb3VuZExheWVycywgJlJlbmRlclN0eWxlOjpiYWNrZ3JvdW5kTGF5ZXJzLCAmRmls bExheWVyOjppc1JlcGVhdFlTZXQsICZGaWxsTGF5ZXI6OnJlcGVhdFksICZGaWxsTGF5ZXI6OnNl dFJlcGVhdFksICZGaWxsTGF5ZXI6OmNsZWFyUmVwZWF0WSwgJkZpbGxMYXllcjo6aW5pdGlhbEZp bGxSZXBlYXRZLCAmQ1NTVG9TdHlsZU1hcDo6bWFwRmlsbFJlcGVhdFk+OjpjcmVhdGVIYW5kbGVy KCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJhY2tncm91bmRTaXplLCBB cHBseVByb3BlcnR5RmlsbExheWVyPEZpbGxTaXplLCBDU1NQcm9wZXJ0eUJhY2tncm91bmRTaXpl LCBCYWNrZ3JvdW5kRmlsbExheWVyLCAmUmVuZGVyU3R5bGU6OmFjY2Vzc0JhY2tncm91bmRMYXll cnMsICZSZW5kZXJTdHlsZTo6YmFja2dyb3VuZExheWVycywgJkZpbGxMYXllcjo6aXNTaXplU2V0 LCAmRmlsbExheWVyOjpzaXplLCAmRmlsbExheWVyOjpzZXRTaXplLCAmRmlsbExheWVyOjpjbGVh clNpemUsICZGaWxsTGF5ZXI6OmluaXRpYWxGaWxsU2l6ZSwgJkNTU1RvU3R5bGVNYXA6Om1hcEZp bGxTaXplPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlCb3JkZXJCb3R0b21Db2xvciwgQXBwbHlQcm9wZXJ0eUNvbG9yPE5vSW5oZXJpdEZyb21Q YXJlbnQsICZSZW5kZXJTdHlsZTo6Ym9yZGVyQm90dG9tQ29sb3IsICZSZW5kZXJTdHlsZTo6c2V0 Qm9yZGVyQm90dG9tQ29sb3IsICZSZW5kZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtCb3JkZXJCb3R0 b21Db2xvciwgJlJlbmRlclN0eWxlOjpjb2xvcj46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0gICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVySW1hZ2VPdXRzZXQsIEFwcGx5UHJvcGVy dHlCb3JkZXJJbWFnZU1vZGlmaWVyPEJvcmRlckltYWdlLCBPdXRzZXQ+OjpjcmVhdGVIYW5kbGVy KCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUJvcmRlckltYWdlUmVwZWF0 LCBBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjxCb3JkZXJJbWFnZSwgUmVwZWF0Pjo6 Y3JlYXRlSGFuZGxlcigpKTsKLSAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3Jk ZXJJbWFnZVNsaWNlLCBBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjxCb3JkZXJJbWFn ZSwgU2xpY2U+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQ cm9wZXJ0eUJvcmRlckltYWdlV2lkdGgsIEFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVy PEJvcmRlckltYWdlLCBXaWR0aD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlI YW5kbGVyKENTU1Byb3BlcnR5Qm9yZGVyTGVmdENvbG9yLCBBcHBseVByb3BlcnR5Q29sb3I8Tm9J bmhlcml0RnJvbVBhcmVudCwgJlJlbmRlclN0eWxlOjpib3JkZXJMZWZ0Q29sb3IsICZSZW5kZXJT dHlsZTo6c2V0Qm9yZGVyTGVmdENvbG9yLCAmUmVuZGVyU3R5bGU6OnNldFZpc2l0ZWRMaW5rQm9y ZGVyTGVmdENvbG9yLCAmUmVuZGVyU3R5bGU6OmNvbG9yPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAg ICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJSaWdodENvbG9yLCBBcHBseVBy b3BlcnR5Q29sb3I8Tm9Jbmhlcml0RnJvbVBhcmVudCwgJlJlbmRlclN0eWxlOjpib3JkZXJSaWdo dENvbG9yLCAmUmVuZGVyU3R5bGU6OnNldEJvcmRlclJpZ2h0Q29sb3IsICZSZW5kZXJTdHlsZTo6 c2V0VmlzaXRlZExpbmtCb3JkZXJSaWdodENvbG9yLCAmUmVuZGVyU3R5bGU6OmNvbG9yPjo6Y3Jl YXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlCb3JkZXJU b3BDb2xvciwgQXBwbHlQcm9wZXJ0eUNvbG9yPE5vSW5oZXJpdEZyb21QYXJlbnQsICZSZW5kZXJT dHlsZTo6Ym9yZGVyVG9wQ29sb3IsICZSZW5kZXJTdHlsZTo6c2V0Qm9yZGVyVG9wQ29sb3IsICZS ZW5kZXJTdHlsZTo6c2V0VmlzaXRlZExpbmtCb3JkZXJUb3BDb2xvciwgJlJlbmRlclN0eWxlOjpj b2xvcj46OmNyZWF0ZUhhbmRsZXIoKSk7CkBAIC0xNTkyLDEwICsxNTEzLDYgQEAgRGVwcmVjYXRl ZFN0eWxlQnVpbGRlcjo6RGVwcmVjYXRlZFN0eWxlQnVpbGRlcigpCiAgICAgc2V0UHJvcGVydHlI YW5kbGVyKENTU1Byb3BlcnR5V2Via2l0Rm9udFNtb290aGluZywgQXBwbHlQcm9wZXJ0eUZvbnQ8 Rm9udFNtb290aGluZ01vZGUsICZGb250RGVzY3JpcHRpb246OmZvbnRTbW9vdGhpbmcsICZGb250 RGVzY3JpcHRpb246OnNldEZvbnRTbW9vdGhpbmcsIEF1dG9TbW9vdGhpbmc+OjpjcmVhdGVIYW5k bGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEZvbnRWYXJp YW50TGlnYXR1cmVzLCBBcHBseVByb3BlcnR5Rm9udFZhcmlhbnRMaWdhdHVyZXM6OmNyZWF0ZUhh bmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TWFycXVl ZVJlcGV0aXRpb24sIEFwcGx5UHJvcGVydHlNYXJxdWVlUmVwZXRpdGlvbjo6Y3JlYXRlSGFuZGxl cigpKTsKLSAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRNYXNrQm94SW1h Z2VPdXRzZXQsIEFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyPEJvcmRlck1hc2ssIE91 dHNldD46OmNyZWF0ZUhhbmRsZXIoKSk7Ci0gICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5V2Via2l0TWFza0JveEltYWdlUmVwZWF0LCBBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2Rp ZmllcjxCb3JkZXJNYXNrLCBSZXBlYXQ+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3Bl cnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdE1hc2tCb3hJbWFnZVNsaWNlLCBBcHBseVByb3Bl cnR5Qm9yZGVySW1hZ2VNb2RpZmllcjxCb3JkZXJNYXNrLCBTbGljZT46OmNyZWF0ZUhhbmRsZXIo KSk7Ci0gICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0TWFza0JveEltYWdl V2lkdGgsIEFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyPEJvcmRlck1hc2ssIFdpZHRo Pjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlX ZWJraXRNYXNrQ2xpcCwgQXBwbHlQcm9wZXJ0eUZpbGxMYXllcjxFRmlsbEJveCwgQ1NTUHJvcGVy dHlXZWJraXRNYXNrQ2xpcCwgTWFza0ZpbGxMYXllciwgJlJlbmRlclN0eWxlOjphY2Nlc3NNYXNr TGF5ZXJzLCAmUmVuZGVyU3R5bGU6Om1hc2tMYXllcnMsICZGaWxsTGF5ZXI6OmlzQ2xpcFNldCwg JkZpbGxMYXllcjo6Y2xpcCwgJkZpbGxMYXllcjo6c2V0Q2xpcCwgJkZpbGxMYXllcjo6Y2xlYXJD bGlwLCAmRmlsbExheWVyOjppbml0aWFsRmlsbENsaXAsICZDU1NUb1N0eWxlTWFwOjptYXBGaWxs Q2xpcD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3Bl cnR5V2Via2l0TWFza0NvbXBvc2l0ZSwgQXBwbHlQcm9wZXJ0eUZpbGxMYXllcjxDb21wb3NpdGVP cGVyYXRvciwgQ1NTUHJvcGVydHlXZWJraXRNYXNrQ29tcG9zaXRlLCBNYXNrRmlsbExheWVyLCAm UmVuZGVyU3R5bGU6OmFjY2Vzc01hc2tMYXllcnMsICZSZW5kZXJTdHlsZTo6bWFza0xheWVycywg JkZpbGxMYXllcjo6aXNDb21wb3NpdGVTZXQsICZGaWxsTGF5ZXI6OmNvbXBvc2l0ZSwgJkZpbGxM YXllcjo6c2V0Q29tcG9zaXRlLCAmRmlsbExheWVyOjpjbGVhckNvbXBvc2l0ZSwgJkZpbGxMYXll cjo6aW5pdGlhbEZpbGxDb21wb3NpdGUsICZDU1NUb1N0eWxlTWFwOjptYXBGaWxsQ29tcG9zaXRl Pjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlX ZWJraXRNYXNrSW1hZ2UsIEFwcGx5UHJvcGVydHlGaWxsTGF5ZXI8U3R5bGVJbWFnZSosIENTU1By b3BlcnR5V2Via2l0TWFza0ltYWdlLCBNYXNrRmlsbExheWVyLCAmUmVuZGVyU3R5bGU6OmFjY2Vz c01hc2tMYXllcnMsICZSZW5kZXJTdHlsZTo6bWFza0xheWVycywgJkZpbGxMYXllcjo6aXNJbWFn ZVNldCwgJkZpbGxMYXllcjo6aW1hZ2UsICZGaWxsTGF5ZXI6OnNldEltYWdlLCAmRmlsbExheWVy OjpjbGVhckltYWdlLCAmRmlsbExheWVyOjppbml0aWFsRmlsbEltYWdlLCAmQ1NTVG9TdHlsZU1h cDo6bWFwRmlsbEltYWdlPjo6Y3JlYXRlSGFuZGxlcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZUJ1aWxkZXJDdXN0b20uaAppbmRleCA5Nzc5OGQ1YWQ5YmM3MDdmM2Y2YTA4NGVjYjI0OGRiYjQ1 NGMwZDg5Li4xMzBjNDhlY2QwNDMwMzY5MzgwOTgxZjMyOTBkY2U3YTVlNTY1ZWM1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC0zNTQsNiArMzU0LDExMCBAQCBp bmxpbmUgdm9pZCBhcHBseVZhbHVlVGV4dEluZGVudChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29s dmVyLCBDU1NWYWx1ZSYgdmFsdWUpCiAjZW5kaWYKIH0KIAorZW51bSBCb3JkZXJJbWFnZVR5cGUg eyBCb3JkZXJJbWFnZSwgV2Via2l0TWFza0JveEltYWdlIH07CitlbnVtIEJvcmRlckltYWdlTW9k aWZpZXJUeXBlIHsgT3V0c2V0LCBSZXBlYXQsIFNsaWNlLCBXaWR0aCB9OwordGVtcGxhdGUgPEJv cmRlckltYWdlVHlwZSB0eXBlLCBCb3JkZXJJbWFnZU1vZGlmaWVyVHlwZSBtb2RpZmllcj4KK2Ns YXNzIEFwcGx5UHJvcGVydHlCb3JkZXJJbWFnZU1vZGlmaWVyIHsKK3B1YmxpYzoKKyAgICBzdGF0 aWMgdm9pZCBhcHBseUluaGVyaXRWYWx1ZShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKQor ICAgIHsKKyAgICAgICAgTmluZVBpZWNlSW1hZ2UgaW1hZ2UoZ2V0VmFsdWUoc3R5bGVSZXNvbHZl ci5zdHlsZSgpKSk7CisgICAgICAgIHN3aXRjaCAobW9kaWZpZXIpIHsKKyAgICAgICAgY2FzZSBP dXRzZXQ6CisgICAgICAgICAgICBpbWFnZS5jb3B5T3V0c2V0RnJvbShnZXRWYWx1ZShzdHlsZVJl c29sdmVyLnBhcmVudFN0eWxlKCkpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNl IFJlcGVhdDoKKyAgICAgICAgICAgIGltYWdlLmNvcHlSZXBlYXRGcm9tKGdldFZhbHVlKHN0eWxl UmVzb2x2ZXIucGFyZW50U3R5bGUoKSkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNh c2UgU2xpY2U6CisgICAgICAgICAgICBpbWFnZS5jb3B5SW1hZ2VTbGljZXNGcm9tKGdldFZhbHVl KHN0eWxlUmVzb2x2ZXIucGFyZW50U3R5bGUoKSkpOworICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIGNhc2UgV2lkdGg6CisgICAgICAgICAgICBpbWFnZS5jb3B5Qm9yZGVyU2xpY2VzRnJvbShn ZXRWYWx1ZShzdHlsZVJlc29sdmVyLnBhcmVudFN0eWxlKCkpKTsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICB9CisgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXIuc3R5bGUoKSwgaW1h Z2UpOworICAgIH0KKworICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbFZhbHVlKFN0eWxlUmVz b2x2ZXImIHN0eWxlUmVzb2x2ZXIpCisgICAgeworICAgICAgICBOaW5lUGllY2VJbWFnZSBpbWFn ZShnZXRWYWx1ZShzdHlsZVJlc29sdmVyLnN0eWxlKCkpKTsKKyAgICAgICAgc3dpdGNoIChtb2Rp ZmllcikgeworICAgICAgICBjYXNlIE91dHNldDoKKyAgICAgICAgICAgIGltYWdlLnNldE91dHNl dChMZW5ndGhCb3goMCkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgUmVwZWF0 OgorICAgICAgICAgICAgaW1hZ2Uuc2V0SG9yaXpvbnRhbFJ1bGUoU3RyZXRjaEltYWdlUnVsZSk7 CisgICAgICAgICAgICBpbWFnZS5zZXRWZXJ0aWNhbFJ1bGUoU3RyZXRjaEltYWdlUnVsZSk7Cisg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBTbGljZToKKyAgICAgICAgICAgIC8vIE1h c2tzIGhhdmUgYSBkaWZmZXJlbnQgaW5pdGlhbCB2YWx1ZSBmb3Igc2xpY2VzLiBQcmVzZXJ2ZSB0 aGUgdmFsdWUgb2YgMCBmb3IgYmFja3dhcmRzIGNvbXBhdGliaWxpdHkuCisgICAgICAgICAgICBp bWFnZS5zZXRJbWFnZVNsaWNlcyh0eXBlID09IEJvcmRlckltYWdlID8gTGVuZ3RoQm94KExlbmd0 aCgxMDAsIFBlcmNlbnQpLCBMZW5ndGgoMTAwLCBQZXJjZW50KSwgTGVuZ3RoKDEwMCwgUGVyY2Vu dCksIExlbmd0aCgxMDAsIFBlcmNlbnQpKSA6IExlbmd0aEJveCgpKTsKKyAgICAgICAgICAgIGlt YWdlLnNldEZpbGwoZmFsc2UpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgV2lk dGg6CisgICAgICAgICAgICAvLyBNYXNrcyBoYXZlIGEgZGlmZmVyZW50IGluaXRpYWwgdmFsdWUg Zm9yIHdpZHRocy4gVGhleSB1c2UgYW4gJ2F1dG8nIHZhbHVlIHJhdGhlciB0aGFuIHRyeWluZyB0 byBmaXQgdG8gdGhlIGJvcmRlci4KKyAgICAgICAgICAgIGltYWdlLnNldEJvcmRlclNsaWNlcyh0 eXBlID09IEJvcmRlckltYWdlID8gTGVuZ3RoQm94KExlbmd0aCgxLCBSZWxhdGl2ZSksIExlbmd0 aCgxLCBSZWxhdGl2ZSksIExlbmd0aCgxLCBSZWxhdGl2ZSksIExlbmd0aCgxLCBSZWxhdGl2ZSkp IDogTGVuZ3RoQm94KCkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAgICAg c2V0VmFsdWUoc3R5bGVSZXNvbHZlci5zdHlsZSgpLCBpbWFnZSk7CisgICAgfQorCisgICAgc3Rh dGljIHZvaWQgYXBwbHlWYWx1ZShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1 ZSYgdmFsdWUpCisgICAgeworICAgICAgICBOaW5lUGllY2VJbWFnZSBpbWFnZShnZXRWYWx1ZShz dHlsZVJlc29sdmVyLnN0eWxlKCkpKTsKKyAgICAgICAgc3dpdGNoIChtb2RpZmllcikgeworICAg ICAgICBjYXNlIE91dHNldDoKKyAgICAgICAgICAgIGltYWdlLnNldE91dHNldChzdHlsZVJlc29s dmVyLnN0eWxlTWFwKCktPm1hcE5pbmVQaWVjZUltYWdlUXVhZCh2YWx1ZSkpOworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgUmVwZWF0OgorICAgICAgICAgICAgc3R5bGVSZXNvbHZl ci5zdHlsZU1hcCgpLT5tYXBOaW5lUGllY2VJbWFnZVJlcGVhdCh2YWx1ZSwgaW1hZ2UpOworICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgU2xpY2U6CisgICAgICAgICAgICBzdHlsZVJl c29sdmVyLnN0eWxlTWFwKCktPm1hcE5pbmVQaWVjZUltYWdlU2xpY2UodmFsdWUsIGltYWdlKTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIFdpZHRoOgorICAgICAgICAgICAgaW1h Z2Uuc2V0Qm9yZGVyU2xpY2VzKHN0eWxlUmVzb2x2ZXIuc3R5bGVNYXAoKS0+bWFwTmluZVBpZWNl SW1hZ2VRdWFkKHZhbHVlKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAg ICBzZXRWYWx1ZShzdHlsZVJlc29sdmVyLnN0eWxlKCksIGltYWdlKTsKKyAgICB9CisKK3ByaXZh dGU6CisgICAgc3RhdGljIGlubGluZSBjb25zdCBOaW5lUGllY2VJbWFnZSYgZ2V0VmFsdWUoUmVu ZGVyU3R5bGUqIHN0eWxlKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHR5cGUgPT0gQm9yZGVySW1h Z2UgPyBzdHlsZS0+Ym9yZGVySW1hZ2UoKSA6IHN0eWxlLT5tYXNrQm94SW1hZ2UoKTsKKyAgICB9 CisKKyAgICBzdGF0aWMgaW5saW5lIHZvaWQgc2V0VmFsdWUoUmVuZGVyU3R5bGUqIHN0eWxlLCBj b25zdCBOaW5lUGllY2VJbWFnZSYgdmFsdWUpCisgICAgeworICAgICAgICByZXR1cm4gdHlwZSA9 PSBCb3JkZXJJbWFnZSA/IHN0eWxlLT5zZXRCb3JkZXJJbWFnZSh2YWx1ZSkgOiBzdHlsZS0+c2V0 TWFza0JveEltYWdlKHZhbHVlKTsKKyAgICB9Cit9OworCisjZGVmaW5lIERFRklORV9CT1JERVJf SU1BR0VfTU9ESUZJRVJfSEFORExFUih0eXBlLCBtb2RpZmllcikgXAoraW5saW5lIHZvaWQgYXBw bHlJbmhlcml0IyN0eXBlIyNtb2RpZmllcihTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKSBc Cit7IFwKKyAgICBBcHBseVByb3BlcnR5Qm9yZGVySW1hZ2VNb2RpZmllcjx0eXBlLCBtb2RpZmll cj46OmFwcGx5SW5oZXJpdFZhbHVlKHN0eWxlUmVzb2x2ZXIpOyBcCit9IFwKK2lubGluZSB2b2lk IGFwcGx5SW5pdGlhbCMjdHlwZSMjbW9kaWZpZXIoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZl cikgXAoreyBcCisgICAgQXBwbHlQcm9wZXJ0eUJvcmRlckltYWdlTW9kaWZpZXI8dHlwZSwgbW9k aWZpZXI+OjphcHBseUluaXRpYWxWYWx1ZShzdHlsZVJlc29sdmVyKTsgXAorfSBcCitpbmxpbmUg dm9pZCBhcHBseVZhbHVlIyN0eXBlIyNtb2RpZmllcihTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29s dmVyLCBDU1NWYWx1ZSYgdmFsdWUpIFwKK3sgXAorICAgIEFwcGx5UHJvcGVydHlCb3JkZXJJbWFn ZU1vZGlmaWVyPHR5cGUsIG1vZGlmaWVyPjo6YXBwbHlWYWx1ZShzdHlsZVJlc29sdmVyLCB2YWx1 ZSk7IFwKK30KKworREVGSU5FX0JPUkRFUl9JTUFHRV9NT0RJRklFUl9IQU5ETEVSKEJvcmRlcklt YWdlLCBPdXRzZXQpCitERUZJTkVfQk9SREVSX0lNQUdFX01PRElGSUVSX0hBTkRMRVIoQm9yZGVy SW1hZ2UsIFJlcGVhdCkKK0RFRklORV9CT1JERVJfSU1BR0VfTU9ESUZJRVJfSEFORExFUihCb3Jk ZXJJbWFnZSwgU2xpY2UpCitERUZJTkVfQk9SREVSX0lNQUdFX01PRElGSUVSX0hBTkRMRVIoQm9y ZGVySW1hZ2UsIFdpZHRoKQorREVGSU5FX0JPUkRFUl9JTUFHRV9NT0RJRklFUl9IQU5ETEVSKFdl YmtpdE1hc2tCb3hJbWFnZSwgT3V0c2V0KQorREVGSU5FX0JPUkRFUl9JTUFHRV9NT0RJRklFUl9I QU5ETEVSKFdlYmtpdE1hc2tCb3hJbWFnZSwgUmVwZWF0KQorREVGSU5FX0JPUkRFUl9JTUFHRV9N T0RJRklFUl9IQU5ETEVSKFdlYmtpdE1hc2tCb3hJbWFnZSwgU2xpY2UpCitERUZJTkVfQk9SREVS X0lNQUdFX01PRElGSUVSX0hBTkRMRVIoV2Via2l0TWFza0JveEltYWdlLCBXaWR0aCkKKwogfSAv LyBuYW1lc3BhY2UgU3R5bGVCdWlsZGVyRnVuY3Rpb25zCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUK