79667 2012-02-27 06:34:54 -0800 [GTK] Add method webkit_web_resource_get_data() to WebKit2 GTK+ API 2012-03-27 01:57:09 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 79477 79777 1 cgarcia webkit-unassigned gustavo pnormand oldest_to_newest 565613 0 cgarcia 2012-02-27 06:34:54 -0800 And webkit_web_resource_get_data_finish() to finish the async operation. 565616 1 129029 cgarcia 2012-02-27 06:39:05 -0800 Created attachment 129029 Patch 566611 2 129029 gustavo 2012-02-28 06:43:37 -0800 Comment on attachment 129029 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129029&action=review +1 > Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp:346 > + * of error. Set @length to a #gsize to get the length of the string. I'd say 'if @length is not %NULL, the size of the data will be assigned to it', also, I would avoid using 'string' in any of these, because they are often not strings. 566615 3 cgarcia 2012-02-28 06:45:25 -0800 (In reply to comment #2) > (From update of attachment 129029 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=129029&action=review > > +1 > > > Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp:346 > > + * of error. Set @length to a #gsize to get the length of the string. > > I'd say 'if @length is not %NULL, the size of the data will be assigned to it', also, I would avoid using 'string' in any of these, because they are often not strings. Indeed, I really meant the data not the string :-P 571728 4 cgarcia 2012-03-06 04:41:34 -0800 I haven't landed this yet, because it depends on bug #79477, a review would be appreciated :-) 588657 5 cgarcia 2012-03-27 01:57:09 -0700 Committed r112227: <http://trac.webkit.org/changeset/112227> 129029 2012-02-27 06:39:05 -0800 2012-02-28 06:43:37 -0800 Patch wk2-resource-get-data.diff text/plain 16116 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMTYzZDI3Li42ODEyZDZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTItMDItMjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEFkZCBtZXRob2Qgd2Via2l0X3dlYl9yZXNvdXJjZV9nZXRfZGF0 YSgpIHRvIFdlYktpdDIgR1RLKyBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc5NjY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJSZXNvdXJjZS5jcHA6 CisgICAgICAgICh3ZWJraXRXZWJSZXNvdXJjZUNyZWF0ZSk6IEFkZCBpc01haW5SZXNvdXJjZSBw YXJhbWV0ZXIgaW5kaWNhdGlvbgorICAgICAgICB3aGV0aGVyIHRoZSByZXNvdXJjZSBpcyB0aGUg bWFpbiBvbmUgb2YgdGhlIGZyYW1lLgorICAgICAgICAocmVzb3VyY2VEYXRhQ2FsbGJhY2spOiBD IEFQSSBjYWxsYmFjayBjYWxsZWQgd2hlbiByZXNvdXJjZSBkYXRhCisgICAgICAgIGlzIGF2YWls YWJsZS4KKyAgICAgICAgKHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGEpOiBBc3luY2hyb25v dXNseSBnZXQgdGhlIHJhdyBkYXRhIG9mCisgICAgICAgIHRoZSByZXNvdXJjZS4KKyAgICAgICAg KHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGFfZmluaXNoKTogRmluaXNoIGFzeW5jaHJvbm91 cworICAgICAgICBvcGVyYXRpb24gc3RhcnRlZCBieSB3ZWJraXRfd2ViX3Jlc291cmNlX2dldF9k YXRhKCkuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViUmVzb3VyY2UuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJSZXNvdXJjZVByaXZhdGUuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAg KHdlYmtpdFdlYlZpZXdSZXNvdXJjZUxvYWRTdGFydGVkKTogUGFzcyBpc01haW5SZXNvdXJjZSBw YXJhbWV0ZXIKKyAgICAgICAgdG8gd2Via2l0V2ViUmVzb3VyY2VDcmVhdGUoKS4KKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0OiBBZGQgbmV3 IHN5bWJvbHMuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNl cy5jcHA6CisgICAgICAgICh0ZXN0V2ViUmVzb3VyY2VHZXREYXRhKToKKyAgICAgICAgKHNlcnZl ckNhbGxiYWNrKToKKyAgICAgICAgKGJlZm9yZUFsbCk6CisKIDIwMTItMDItMjYgIFlvdW5nVGFl Y2sgU29uZyAgPHlvdW5ndGFlY2suc29uZ0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXVtX SzJdIEFkZCBJbmplY3RlZEJ1bmRsZUVmbC5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlJlc291cmNlLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlJlc291cmNlLmNwcAppbmRleCBkYTczNjI0Li44 NTBlMzRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJSZXNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViUmVzb3VyY2UuY3BwCkBAIC01MCw2ICs1MCw3IEBAIHN0cnVjdCBfV2ViS2l0V2Vi UmVzb3VyY2VQcml2YXRlIHsKICAgICBXS1JldGFpblB0cjxXS0ZyYW1lUmVmPiB3a0ZyYW1lOwog ICAgIENTdHJpbmcgdXJpOwogICAgIEdSZWZQdHI8V2ViS2l0VVJJUmVzcG9uc2U+IHJlc3BvbnNl OworICAgIGJvb2wgaXNNYWluUmVzb3VyY2U7CiB9OwogCiBzdGF0aWMgZ3VpbnQgc2lnbmFsc1tM QVNUX1NJR05BTF0gPSB7IDAsIH07CkBAIC0yMDQsMTIgKzIwNSwxMyBAQCBzdGF0aWMgdm9pZCB3 ZWJraXRXZWJSZXNvdXJjZVVwZGF0ZVVSSShXZWJLaXRXZWJSZXNvdXJjZSogcmVzb3VyY2UsIGNv bnN0IENTdHJpbgogICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChyZXNvdXJjZSksICJ1cmki KTsKIH0KIAotV2ViS2l0V2ViUmVzb3VyY2UqIHdlYmtpdFdlYlJlc291cmNlQ3JlYXRlKFdLRnJh bWVSZWYgd2tGcmFtZSwgV2ViS2l0VVJJUmVxdWVzdCogcmVxdWVzdCkKK1dlYktpdFdlYlJlc291 cmNlKiB3ZWJraXRXZWJSZXNvdXJjZUNyZWF0ZShXS0ZyYW1lUmVmIHdrRnJhbWUsIFdlYktpdFVS SVJlcXVlc3QqIHJlcXVlc3QsIGJvb2wgaXNNYWluUmVzb3VyY2UpCiB7CiAgICAgQVNTRVJUKHdr RnJhbWUpOwogICAgIFdlYktpdFdlYlJlc291cmNlKiByZXNvdXJjZSA9IFdFQktJVF9XRUJfUkVT T1VSQ0UoZ19vYmplY3RfbmV3KFdFQktJVF9UWVBFX1dFQl9SRVNPVVJDRSwgTlVMTCkpOwogICAg IHJlc291cmNlLT5wcml2LT53a0ZyYW1lID0gd2tGcmFtZTsKICAgICByZXNvdXJjZS0+cHJpdi0+ dXJpID0gd2Via2l0X3VyaV9yZXF1ZXN0X2dldF91cmkocmVxdWVzdCk7CisgICAgcmVzb3VyY2Ut PnByaXYtPmlzTWFpblJlc291cmNlID0gaXNNYWluUmVzb3VyY2U7CiAgICAgcmV0dXJuIHJlc291 cmNlOwogfQogCkBAIC0yOTksMyArMzAxLDYzIEBAIFdlYktpdFVSSVJlc3BvbnNlKiB3ZWJraXRf d2ViX3Jlc291cmNlX2dldF9yZXNwb25zZShXZWJLaXRXZWJSZXNvdXJjZSogcmVzb3VyY2UpCiAg ICAgcmV0dXJuIHJlc291cmNlLT5wcml2LT5yZXNwb25zZS5nZXQoKTsKIH0KIAorc3RhdGljIHZv aWQgcmVzb3VyY2VEYXRhQ2FsbGJhY2soV0tEYXRhUmVmIGRhdGEsIFdLRXJyb3JSZWYsIHZvaWQq IGNvbnRleHQpCit7CisgICAgR1JlZlB0cjxHU2ltcGxlQXN5bmNSZXN1bHQ+IHJlc3VsdCA9IGFk b3B0R1JlZihHX1NJTVBMRV9BU1lOQ19SRVNVTFQoY29udGV4dCkpOworICAgIGdfc2ltcGxlX2Fz eW5jX3Jlc3VsdF9zZXRfb3BfcmVzX2dwb2ludGVyKHJlc3VsdC5nZXQoKSwgY29uc3RfY2FzdDxP cGFxdWVXS0RhdGEqPihkYXRhKSwgMCk7CisgICAgZ19zaW1wbGVfYXN5bmNfcmVzdWx0X2NvbXBs ZXRlKHJlc3VsdC5nZXQoKSk7Cit9CisKKy8qKgorICogd2Via2l0X3dlYl9yZXNvdXJjZV9nZXRf ZGF0YToKKyAqIEByZXNvdXJjZTogYSAjV2ViS2l0V2ViUmVzb3VyY2UKKyAqIEBjYWxsYmFjazog KHNjb3BlIGFzeW5jKTogYSAjR0FzeW5jUmVhZHlDYWxsYmFjayB0byBjYWxsIHdoZW4gdGhlIHJl cXVlc3QgaXMgc2F0aXNmaWVkCisgKiBAdXNlcl9kYXRhOiAoY2xvc3VyZSk6IHRoZSBkYXRhIHRv IHBhc3MgdG8gY2FsbGJhY2sgZnVuY3Rpb24KKyAqCisgKiBBc3luY2hyb25vdXNseSBnZXQgdGhl IHJhdyBkYXRhIGZvciBAcmVzb3VyY2UuCisgKgorICogV2hlbiB0aGUgb3BlcmF0aW9uIGlzIGZp bmlzaGVkLCBAY2FsbGJhY2sgd2lsbCBiZSBjYWxsZWQuIFlvdSBjYW4gdGhlbiBjYWxsCisgKiB3 ZWJraXRfd2ViX3Jlc291cmNlX2dldF9kYXRhX2ZpbmlzaCgpIHRvIGdldCB0aGUgcmVzdWx0IG9m IHRoZSBvcGVyYXRpb24uCisgKi8KK3ZvaWQgd2Via2l0X3dlYl9yZXNvdXJjZV9nZXRfZGF0YShX ZWJLaXRXZWJSZXNvdXJjZSogcmVzb3VyY2UsIEdBc3luY1JlYWR5Q2FsbGJhY2sgY2FsbGJhY2ss IGdwb2ludGVyIHVzZXJEYXRhKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dF Ql9SRVNPVVJDRShyZXNvdXJjZSkpOworCisgICAgR1NpbXBsZUFzeW5jUmVzdWx0KiByZXN1bHQg PSBnX3NpbXBsZV9hc3luY19yZXN1bHRfbmV3KEdfT0JKRUNUKHJlc291cmNlKSwgY2FsbGJhY2ss IHVzZXJEYXRhLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZWludGVycHJldF9jYXN0PGdwb2ludGVyPih3ZWJraXRfd2ViX3Jlc291 cmNlX2dldF9kYXRhKSk7CisgICAgaWYgKHJlc291cmNlLT5wcml2LT5pc01haW5SZXNvdXJjZSkK KyAgICAgICAgV0tGcmFtZUdldE1haW5SZXNvdXJjZURhdGEocmVzb3VyY2UtPnByaXYtPndrRnJh bWUuZ2V0KCksIHJlc291cmNlRGF0YUNhbGxiYWNrLCByZXN1bHQpOworICAgIGVsc2UgeworICAg ICAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gdXJsKEFkb3B0V0ssIFdLVVJMQ3JlYXRlV2l0aFVU RjhDU3RyaW5nKHJlc291cmNlLT5wcml2LT51cmkuZGF0YSgpKSk7CisgICAgICAgIFdLRnJhbWVH ZXRSZXNvdXJjZURhdGEocmVzb3VyY2UtPnByaXYtPndrRnJhbWUuZ2V0KCksIHVybC5nZXQoKSwg cmVzb3VyY2VEYXRhQ2FsbGJhY2ssIHJlc3VsdCk7CisgICAgfQorfQorCisvKioKKyAqIHdlYmtp dF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGFfZmluaXNoOgorICogQHJlc291cmNlOiBhICNXZWJLaXRX ZWJSZXNvdXJjZQorICogQHJlc3VsdDogYSAjR0FzeW5jUmVzdWx0CisgKiBAbGVuZ3RoOiAob3V0 KTogcmV0dXJuIGxvY2F0aW9uIGZvciB0aGUgbGVuZ3RoIG9mIHRoZSByZXNvdXJjZSBkYXRhCisg KiBAZXJyb3I6IHJldHVybiBsb2NhdGlvbiBmb3IgZXJyb3Igb3IgJU5VTEwgdG8gaWdub3JlCisg KgorICogRmluaXNoIGFuIGFzeW5jaHJvbm91cyBvcGVyYXRpb24gc3RhcnRlZCB3aXRoIHdlYmtp dF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGEoKS4KKyAqCisgKiBSZXR1cm5zOiAodHJhbnNmZXIgZnVs bCk6IGEgc3RyaW5nIHdpdGggdGhlIGRhdGEgb2YgQHJlc291cmNlLCBvciAlTlVMTCBpbiBjYXNl CisgKiAgICBvZiBlcnJvci4gU2V0IEBsZW5ndGggdG8gYSAjZ3NpemUgdG8gZ2V0IHRoZSBsZW5n dGggb2YgdGhlIHN0cmluZy4KKyAqLworZ3VjaGFyKiB3ZWJraXRfd2ViX3Jlc291cmNlX2dldF9k YXRhX2ZpbmlzaChXZWJLaXRXZWJSZXNvdXJjZSogcmVzb3VyY2UsIEdBc3luY1Jlc3VsdCogcmVz dWx0LCBnc2l6ZSogbGVuZ3RoLCBHRXJyb3IqKiBlcnJvcikKK3sKKyAgICBnX3JldHVybl92YWxf aWZfZmFpbChXRUJLSVRfSVNfV0VCX1JFU09VUkNFKHJlc291cmNlKSwgMCk7CisgICAgZ19yZXR1 cm5fdmFsX2lmX2ZhaWwoR19JU19BU1lOQ19SRVNVTFQocmVzdWx0KSwgMCk7CisKKyAgICBHU2lt cGxlQXN5bmNSZXN1bHQqIHNpbXBsZSA9IEdfU0lNUExFX0FTWU5DX1JFU1VMVChyZXN1bHQpOwor ICAgIGdfd2Fybl9pZl9mYWlsKGdfc2ltcGxlX2FzeW5jX3Jlc3VsdF9nZXRfc291cmNlX3RhZyhz aW1wbGUpID09IHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGEpOworCisgICAgaWYgKGdfc2lt cGxlX2FzeW5jX3Jlc3VsdF9wcm9wYWdhdGVfZXJyb3Ioc2ltcGxlLCBlcnJvcikpCisgICAgICAg IHJldHVybiAwOworCisgICAgV0tEYXRhUmVmIHdrRGF0YSA9IHN0YXRpY19jYXN0PFdLRGF0YVJl Zj4oZ19zaW1wbGVfYXN5bmNfcmVzdWx0X2dldF9vcF9yZXNfZ3BvaW50ZXIoc2ltcGxlKSk7Cisg ICAgaWYgKGxlbmd0aCkKKyAgICAgICAgKmxlbmd0aCA9IFdLRGF0YUdldFNpemUod2tEYXRhKTsK KyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Z3VjaGFyKj4oZ19tZW1kdXAoV0tEYXRhR2V0Qnl0ZXMo d2tEYXRhKSwgV0tEYXRhR2V0U2l6ZSh3a0RhdGEpKSk7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJSZXNvdXJjZS5oIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViUmVzb3VyY2UuaAppbmRleCA1NTk3NWFh Li4zNGFmNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJSZXNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlJlc291cmNlLmgKQEAgLTI1LDYgKzI1LDcgQEAKICNkZWZpbmUgV2ViS2l0V2Vi UmVzb3VyY2VfaAogCiAjaW5jbHVkZSA8Z2xpYi1vYmplY3QuaD4KKyNpbmNsdWRlIDxnaW8vZ2lv Lmg+CiAjaW5jbHVkZSA8d2Via2l0Mi9XZWJLaXREZWZpbmVzLmg+CiAjaW5jbHVkZSA8d2Via2l0 Mi9XZWJLaXRVUklSZXNwb25zZS5oPgogCkBAIC02MCw2ICs2MSwxNyBAQCB3ZWJraXRfd2ViX3Jl c291cmNlX2dldF91cmkgICAgICAgICAoV2ViS2l0V2ViUmVzb3VyY2UgICpyZXNvdXJjZSk7CiBX RUJLSVRfQVBJIFdlYktpdFVSSVJlc3BvbnNlICoKIHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X3Jl c3BvbnNlICAgIChXZWJLaXRXZWJSZXNvdXJjZSAgKnJlc291cmNlKTsKIAorV0VCS0lUX0FQSSB2 b2lkCit3ZWJraXRfd2ViX3Jlc291cmNlX2dldF9kYXRhICAgICAgICAoV2ViS2l0V2ViUmVzb3Vy Y2UgICpyZXNvdXJjZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHQXN5 bmNSZWFkeUNhbGxiYWNrIGNhbGxiYWNrLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGdwb2ludGVyICAgICAgICAgICAgdXNlcl9kYXRhKTsKKworV0VCS0lUX0FQSSBndWNo YXIgKgord2Via2l0X3dlYl9yZXNvdXJjZV9nZXRfZGF0YV9maW5pc2ggKFdlYktpdFdlYlJlc291 cmNlICAqcmVzb3VyY2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0Fz eW5jUmVzdWx0ICAgICAgICpyZXN1bHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZ3NpemUgICAgICAgICAgICAgICpsZW5ndGgsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgR0Vycm9yICAgICAgICAgICAgKiplcnJvcik7CisKIEdfRU5EX0RFQ0xT CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViUmVzb3VyY2VQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJSZXNvdXJjZVByaXZhdGUuaAppbmRleCAyNWE1NGQ2Li41MDExYWU0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJSZXNv dXJjZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJSZXNvdXJjZVByaXZhdGUuaApAQCAtMjMsNyArMjMsNyBAQAogI2luY2x1ZGUgIldlYktp dFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRXZWJSZXNvdXJjZS5oIgogCi1XZWJLaXRXZWJS ZXNvdXJjZSogd2Via2l0V2ViUmVzb3VyY2VDcmVhdGUoV0tGcmFtZVJlZiwgV2ViS2l0VVJJUmVx dWVzdCopOworV2ViS2l0V2ViUmVzb3VyY2UqIHdlYmtpdFdlYlJlc291cmNlQ3JlYXRlKFdLRnJh bWVSZWYsIFdlYktpdFVSSVJlcXVlc3QqLCBib29sIGlzTWFpblJlc291cmNlKTsKIHZvaWQgd2Vi a2l0V2ViUmVzb3VyY2VTZW50UmVxdWVzdChXZWJLaXRXZWJSZXNvdXJjZSosIFdlYktpdFVSSVJl cXVlc3QqLCBXZWJLaXRVUklSZXNwb25zZSopOwogdm9pZCB3ZWJraXRXZWJSZXNvdXJjZVNldFJl c3BvbnNlKFdlYktpdFdlYlJlc291cmNlKiwgV2ViS2l0VVJJUmVzcG9uc2UqKTsKIHZvaWQgd2Vi a2l0V2ViUmVzb3VyY2VOb3RpZnlQcm9ncmVzcyhXZWJLaXRXZWJSZXNvdXJjZSosIGd1aW50NjQg Ynl0ZXNSZWNlaXZlZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXcuY3BwCmluZGV4IGIwM2U1NGEuLmFmOGMzNmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC04NTgs NyArODU4LDcgQEAgdm9pZCB3ZWJraXRXZWJWaWV3UHJpbnRGcmFtZShXZWJLaXRXZWJWaWV3KiB3 ZWJWaWV3LCBXS0ZyYW1lUmVmIHdrRnJhbWUpCiB2b2lkIHdlYmtpdFdlYlZpZXdSZXNvdXJjZUxv YWRTdGFydGVkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIFdLRnJhbWVSZWYgd2tGcmFtZSwgdWlu dDY0X3QgcmVzb3VyY2VJZGVudGlmaWVyLCBXZWJLaXRVUklSZXF1ZXN0KiByZXF1ZXN0LCBib29s IGlzTWFpblJlc291cmNlKQogewogICAgIC8vIEZJWE1FOiBpZ25vcmUgcmVzb3VyY2VzIHdoZW4g cmVwbGFjaW5nIGNvbnRlbnQuCi0gICAgV2ViS2l0V2ViUmVzb3VyY2UqIHJlc291cmNlID0gd2Vi a2l0V2ViUmVzb3VyY2VDcmVhdGUod2tGcmFtZSwgcmVxdWVzdCk7CisgICAgV2ViS2l0V2ViUmVz b3VyY2UqIHJlc291cmNlID0gd2Via2l0V2ViUmVzb3VyY2VDcmVhdGUod2tGcmFtZSwgcmVxdWVz dCwgaXNNYWluUmVzb3VyY2UpOwogICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2Vi Vmlldy0+cHJpdjsKICAgICBpZiAoV0tGcmFtZUlzTWFpbkZyYW1lKHdrRnJhbWUpICYmIGlzTWFp blJlc291cmNlKQogICAgICAgICBwcml2LT5tYWluUmVzb3VyY2UgPSByZXNvdXJjZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1z ZWN0aW9ucy50eHQgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtp dDJndGstc2VjdGlvbnMudHh0CmluZGV4IDg0MmY4Y2YuLjkxZWJlOGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0aW9ucy50 eHQKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3Rr LXNlY3Rpb25zLnR4dApAQCAtNDUyLDYgKzQ1Miw4IEBAIHdlYmtpdF9wcmludF9vcGVyYXRpb25f Z2V0X3R5cGUKIFdlYktpdFdlYlJlc291cmNlCiB3ZWJraXRfd2ViX3Jlc291cmNlX2dldF91cmkK IHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X3Jlc3BvbnNlCit3ZWJraXRfd2ViX3Jlc291cmNlX2dl dF9kYXRhCit3ZWJraXRfd2ViX3Jlc291cmNlX2dldF9kYXRhX2ZpbmlzaAogCiA8U1VCU0VDVElP TiBTdGFuZGFyZD4KIFdlYktpdFdlYlJlc291cmNlQ2xhc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAKaW5kZXgg MWNjNGI1NS4uMmM3NjQ4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAKQEAgLTI1LDYgKzI1LDIzIEBACiAK IHN0YXRpYyBXZWJLaXRUZXN0U2VydmVyKiBrU2VydmVyOwogCitzdGF0aWMgY29uc3QgY2hhciog a0luZGV4SHRtbCA9CisgICAgIjxodG1sPjxoZWFkPiIKKyAgICAiIDxsaW5rIHJlbD0nc3R5bGVz aGVldCcgaHJlZj0nL3N0eWxlLmNzcycgdHlwZT0ndGV4dC9jc3MnPiIKKyAgICAiIDxzY3JpcHQg bGFuZ3VhZ2U9J2phdmFzY3JpcHQnIHNyYz0nL2phdmFzY3JpcHQuanMnPjwvc2NyaXB0PiIKKyAg ICAiPC9oZWFkPjxib2R5PldlYktpdEdUSysgcmVzb3VyY2VzIHRlc3Q8L2JvZHk+PC9odG1sPiI7 CisKK3N0YXRpYyBjb25zdCBjaGFyKiBrU3R5bGVDU1MgPQorICAgICJib2R5IHsiCisgICAgIiAg ICBtYXJnaW46IDBweDsiCisgICAgIiAgICBwYWRkaW5nOiAwcHg7IgorICAgICIgICAgZm9udC1m YW1pbHk6IHNhbnMtc2VyaWY7IgorICAgICIgICAgYmFja2dyb3VuZDogdXJsKC9ibGFuay5pY28p IDAgMCBuby1yZXBlYXQ7IgorICAgICIgICAgY29sb3I6IGJsYWNrOyIKKyAgICAifSI7CisKK3N0 YXRpYyBjb25zdCBjaGFyKiBrSmF2YXNjcmlwdCA9ICJmdW5jdGlvbiBmb28gKCkgeyB2YXIgYSA9 IDE7IH0iOworCiBjbGFzcyBSZXNvdXJjZXNUZXN0OiBwdWJsaWMgV2ViVmlld1Rlc3QgewogcHVi bGljOgogICAgIE1BS0VfR0xJQl9URVNUX0ZJWFRVUkUoUmVzb3VyY2VzVGVzdCk7CkBAIC03NSw2 ICs5Miw3IEBAIHB1YmxpYzoKICAgICAgICAgOiBXZWJWaWV3VGVzdCgpCiAgICAgICAgICwgbV9y ZXNvdXJjZXNMb2FkZWQoMCkKICAgICAgICAgLCBtX3Jlc291cmNlc1RvTG9hZCgwKQorICAgICAg ICAsIG1fcmVzb3VyY2VEYXRhU2l6ZSgwKQogICAgIHsKICAgICAgICAgZ19zaWduYWxfY29ubmVj dChtX3dlYlZpZXcsICJyZXNvdXJjZS1sb2FkLXN0YXJ0ZWQiLCBHX0NBTExCQUNLKHJlc291cmNl TG9hZFN0YXJ0ZWRDYWxsYmFjayksIHRoaXMpOwogICAgIH0KQEAgLTExNCw4ICsxMzIsNDYgQEAg cHVibGljOgogICAgICAgICBnX21haW5fbG9vcF9ydW4obV9tYWluTG9vcCk7CiAgICAgfQogCisg ICAgc3RhdGljIHZvaWQgcmVzb3VyY2VHZXREYXRhQ2FsbGJhY2soR09iamVjdCogb2JqZWN0LCBH QXN5bmNSZXN1bHQqIHJlc3VsdCwgZ3BvaW50ZXIgdXNlckRhdGEpCisgICAgeworICAgICAgICBz aXplX3QgZGF0YVNpemU7CisgICAgICAgIEdPd25QdHI8R0Vycm9yPiBlcnJvcjsKKyAgICAgICAg dW5zaWduZWQgY2hhciogZGF0YSA9IHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGFfZmluaXNo KFdFQktJVF9XRUJfUkVTT1VSQ0Uob2JqZWN0KSwgcmVzdWx0LCAmZGF0YVNpemUsICZlcnJvci5v dXRQdHIoKSk7CisgICAgICAgIGdfYXNzZXJ0KCFlcnJvci5nZXQoKSk7CisgICAgICAgIGdfYXNz ZXJ0KGRhdGEpOworICAgICAgICBnX2Fzc2VydF9jbXBpbnQoZGF0YVNpemUsID4sIDApOworCisg ICAgICAgIFJlc291cmNlc1Rlc3QqIHRlc3QgPSBzdGF0aWNfY2FzdDxSZXNvdXJjZXNUZXN0Kj4o dXNlckRhdGEpOworICAgICAgICB0ZXN0LT5tX3Jlc291cmNlRGF0YS5zZXQocmVpbnRlcnByZXRf Y2FzdDxjaGFyKj4oZGF0YSkpOworICAgICAgICB0ZXN0LT5tX3Jlc291cmNlRGF0YVNpemUgPSBk YXRhU2l6ZTsKKyAgICAgICAgZ19tYWluX2xvb3BfcXVpdCh0ZXN0LT5tX21haW5Mb29wKTsKKyAg ICB9CisKKyAgICB2b2lkIGNoZWNrUmVzb3VyY2VEYXRhKFdlYktpdFdlYlJlc291cmNlKiByZXNv dXJjZSkKKyAgICB7CisgICAgICAgIG1fcmVzb3VyY2VEYXRhU2l6ZSA9IDA7CisgICAgICAgIHdl YmtpdF93ZWJfcmVzb3VyY2VfZ2V0X2RhdGEocmVzb3VyY2UsIHJlc291cmNlR2V0RGF0YUNhbGxi YWNrLCB0aGlzKTsKKyAgICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOworCisgICAg ICAgIGNvbnN0IGNoYXIqIHVyaSA9IHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X3VyaShyZXNvdXJj ZSk7CisgICAgICAgIGlmICh1cmkgPT0ga1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiLyIpKSB7Cisg ICAgICAgICAgICBnX2Fzc2VydF9jbXBpbnQobV9yZXNvdXJjZURhdGFTaXplLCA9PSwgc3RybGVu KGtJbmRleEh0bWwpKTsKKyAgICAgICAgICAgIGdfYXNzZXJ0KCFzdHJuY21wKG1fcmVzb3VyY2VE YXRhLmdldCgpLCBrSW5kZXhIdG1sLCBtX3Jlc291cmNlRGF0YVNpemUpKTsKKyAgICAgICAgfSBl bHNlIGlmICh1cmkgPT0ga1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL3N0eWxlLmNzcyIpKSB7Cisg ICAgICAgICAgICBnX2Fzc2VydF9jbXBpbnQobV9yZXNvdXJjZURhdGFTaXplLCA9PSwgc3RybGVu KGtTdHlsZUNTUykpOworICAgICAgICAgICAgZ19hc3NlcnQoIXN0cm5jbXAobV9yZXNvdXJjZURh dGEuZ2V0KCksIGtTdHlsZUNTUywgbV9yZXNvdXJjZURhdGFTaXplKSk7CisgICAgICAgIH0gZWxz ZSBpZiAodXJpID09IGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9qYXZhc2NyaXB0LmpzIikpIHsK KyAgICAgICAgICAgIGdfYXNzZXJ0X2NtcGludChtX3Jlc291cmNlRGF0YVNpemUsID09LCBzdHJs ZW4oa0phdmFzY3JpcHQpKTsKKyAgICAgICAgICAgIGdfYXNzZXJ0KCFzdHJuY21wKG1fcmVzb3Vy Y2VEYXRhLmdldCgpLCBrSmF2YXNjcmlwdCwgbV9yZXNvdXJjZURhdGFTaXplKSk7CisgICAgICAg IH0gZWxzZQorICAgICAgICAgICAgZ19hc3NlcnRfbm90X3JlYWNoZWQoKTsKKyAgICAgICAgbV9y ZXNvdXJjZURhdGEuY2xlYXIoKTsKKyAgICB9CisKICAgICBzaXplX3QgbV9yZXNvdXJjZXNMb2Fk ZWQ7CiAgICAgc2l6ZV90IG1fcmVzb3VyY2VzVG9Mb2FkOworICAgIEdPd25QdHI8Y2hhcj4gbV9y ZXNvdXJjZURhdGE7CisgICAgc2l6ZV90IG1fcmVzb3VyY2VEYXRhU2l6ZTsKIH07CiAKIHN0YXRp YyB2b2lkIHRlc3RXZWJWaWV3UmVzb3VyY2VzKFJlc291cmNlc1Rlc3QqIHRlc3QsIGdjb25zdHBv aW50ZXIpCkBAIC00MDksNiArNDY1LDIyIEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJSZXNvdXJjZUFj dGl2ZVVSSShSZXNvdXJjZVVSSVRyYWNraW5nVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlCiAgICAg dGVzdC0+d2FpdFVudGlsUmVzb3VyY2VMb2FkRmluc2loZWQoKTsKIH0KIAorc3RhdGljIHZvaWQg dGVzdFdlYlJlc291cmNlR2V0RGF0YShSZXNvdXJjZXNUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVy KQoreworICAgIHRlc3QtPmxvYWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiLyIpLmRhdGEo KSk7CisgICAgLy8gRklYTUU6IHRoaXMgc2hvdWxkIGJlIDQgaW5zdGVhZCBvZiAzLCBidXQgd2Ug ZG9uJ3QgZ2V0IHRoZSBjc3MgaW1hZ2UgcmVzb3VyY2UKKyAgICAvLyBkdWUgdG8gYnVnIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODUxMC4KKyAgICB0ZXN0LT53YWl0 VW50aWxSZXNvdXJjZXNMb2FkZWQoMyk7CisKKyAgICBXZWJLaXRXZWJSZXNvdXJjZSogcmVzb3Vy Y2UgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5fcmVzb3VyY2UodGVzdC0+bV93ZWJWaWV3KTsK KyAgICBnX2Fzc2VydChyZXNvdXJjZSk7CisgICAgdGVzdC0+Y2hlY2tSZXNvdXJjZURhdGEocmVz b3VyY2UpOworCisgICAgR093blB0cjxHTGlzdD4gc3VicmVzb3VyY2VzKHdlYmtpdF93ZWJfdmll d19nZXRfc3VicmVzb3VyY2VzKHRlc3QtPm1fd2ViVmlldykpOworICAgIGZvciAoR0xpc3QqIGl0 ZW0gPSBzdWJyZXNvdXJjZXMuZ2V0KCk7IGl0ZW07IGl0ZW0gPSBnX2xpc3RfbmV4dChpdGVtKSkK KyAgICAgICAgdGVzdC0+Y2hlY2tSZXNvdXJjZURhdGEoV0VCS0lUX1dFQl9SRVNPVVJDRShpdGVt LT5kYXRhKSk7Cit9CisKIHN0YXRpYyB2b2lkIGFkZENhY2hlSFRUUEhlYWRlcnNUb1Jlc3Bvc2Uo U291cE1lc3NhZ2UqIG1lc3NhZ2UpCiB7CiAgICAgLy8gVGhlIGFjdHVhbCBkYXRlIGRvZXNuJ3Qg cmVhbGx5IG1hdHRlci4KQEAgLTQzOSwxMiArNTExLDcgQEAgc3RhdGljIHZvaWQgc2VydmVyQ2Fs bGJhY2soU291cFNlcnZlciogc2VydmVyLCBTb3VwTWVzc2FnZSogbWVzc2FnZSwgY29uc3QgY2hh cioKICAgICB9CiAKICAgICBpZiAoZ19zdHJfZXF1YWwocGF0aCwgIi8iKSkgewotICAgICAgICBz dGF0aWMgY29uc3QgY2hhciogaW5kZXhIdG1sID0KLSAgICAgICAgICAgICI8aHRtbD48aGVhZD4i Ci0gICAgICAgICAgICAiIDxsaW5rIHJlbD0nc3R5bGVzaGVldCcgaHJlZj0nL3N0eWxlLmNzcycg dHlwZT0ndGV4dC9jc3MnPiIKLSAgICAgICAgICAgICIgPHNjcmlwdCBsYW5ndWFnZT0namF2YXNj cmlwdCcgc3JjPScvamF2YXNjcmlwdC5qcyc+PC9zY3JpcHQ+IgotICAgICAgICAgICAgIjwvaGVh ZD48Ym9keT5XZWJLaXRHVEsrIHJlc291cmNlcyB0ZXN0PC9ib2R5PjwvaHRtbD4iOwotICAgICAg ICBzb3VwX21lc3NhZ2VfYm9keV9hcHBlbmQobWVzc2FnZS0+cmVzcG9uc2VfYm9keSwgU09VUF9N RU1PUllfU1RBVElDLCBpbmRleEh0bWwsIHN0cmxlbihpbmRleEh0bWwpKTsKKyAgICAgICAgc291 cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNPVVBfTUVNT1JZ X1NUQVRJQywga0luZGV4SHRtbCwgc3RybGVuKGtJbmRleEh0bWwpKTsKICAgICB9IGVsc2UgaWYg KGdfc3RyX2VxdWFsKHBhdGgsICIvamF2YXNjcmlwdC5odG1sIikpIHsKICAgICAgICAgc3RhdGlj IGNvbnN0IGNoYXIqIGphdmFzY3JpcHRIdG1sID0gIjxodG1sPjxoZWFkPjxzY3JpcHQgbGFuZ3Vh Z2U9J2phdmFzY3JpcHQnIHNyYz0nL2phdmFzY3JpcHQuanMnPjwvc2NyaXB0PjwvaGVhZD48Ym9k eT48L2JvZHk+PC9odG1sPiI7CiAgICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNz YWdlLT5yZXNwb25zZV9ib2R5LCBTT1VQX01FTU9SWV9TVEFUSUMsIGphdmFzY3JpcHRIdG1sLCBz dHJsZW4oamF2YXNjcmlwdEh0bWwpKTsKQEAgLTQ1OCwxOSArNTI1LDEwIEBAIHN0YXRpYyB2b2lk IHNlcnZlckNhbGxiYWNrKFNvdXBTZXJ2ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2Us IGNvbnN0IGNoYXIqCiAgICAgICAgIHN0YXRpYyBjb25zdCBjaGFyKiBpbnZhbGlkQ1NTSHRtbCA9 ICI8aHRtbD48aGVhZD48bGluayByZWw9J3N0eWxlc2hlZXQnIGhyZWY9Jy9pbnZhbGlkLmNzcycg dHlwZT0ndGV4dC9jc3MnPjwvaGVhZD48Ym9keT48L2h0bWw+IjsKICAgICAgICAgc291cF9tZXNz YWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNPVVBfTUVNT1JZX1NUQVRJ QywgaW52YWxpZENTU0h0bWwsIHN0cmxlbihpbnZhbGlkQ1NTSHRtbCkpOwogICAgIH0gZWxzZSBp ZiAoZ19zdHJfZXF1YWwocGF0aCwgIi9zdHlsZS5jc3MiKSkgewotICAgICAgICBzdGF0aWMgY29u c3QgY2hhciogY3NzID0KLSAgICAgICAgICAgICJib2R5IHsiCi0gICAgICAgICAgICAiICAgIG1h cmdpbjogMHB4OyIKLSAgICAgICAgICAgICIgICAgcGFkZGluZzogMHB4OyIKLSAgICAgICAgICAg ICIgICAgZm9udC1mYW1pbHk6IHNhbnMtc2VyaWY7IgotICAgICAgICAgICAgIiAgICBiYWNrZ3Jv dW5kOiB1cmwoL2JsYW5rLmljbykgMCAwIG5vLXJlcGVhdDsiCi0gICAgICAgICAgICAiICAgIGNv bG9yOiBibGFjazsiCi0gICAgICAgICAgICAifSI7Ci0gICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5 X2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9ib2R5LCBTT1VQX01FTU9SWV9TVEFUSUMsIGNzcywg c3RybGVuKGNzcykpOworICAgICAgICBzb3VwX21lc3NhZ2VfYm9keV9hcHBlbmQobWVzc2FnZS0+ cmVzcG9uc2VfYm9keSwgU09VUF9NRU1PUllfU1RBVElDLCBrU3R5bGVDU1MsIHN0cmxlbihrU3R5 bGVDU1MpKTsKICAgICAgICAgYWRkQ2FjaGVIVFRQSGVhZGVyc1RvUmVzcG9zZShtZXNzYWdlKTsK ICAgICB9IGVsc2UgaWYgKGdfc3RyX2VxdWFsKHBhdGgsICIvamF2YXNjcmlwdC5qcyIpKSB7Ci0g ICAgICAgIHN0YXRpYyBjb25zdCBjaGFyKiBqYXZhc2NyaXB0ID0gImZ1bmN0aW9uIGZvbyAoKSB7 IHZhciBhID0gMTsgfSI7Ci0gICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdl LT5yZXNwb25zZV9ib2R5LCBTT1VQX01FTU9SWV9TVEFUSUMsIGphdmFzY3JpcHQsIHN0cmxlbihq YXZhc2NyaXB0KSk7CisgICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5y ZXNwb25zZV9ib2R5LCBTT1VQX01FTU9SWV9TVEFUSUMsIGtKYXZhc2NyaXB0LCBzdHJsZW4oa0ph dmFzY3JpcHQpKTsKICAgICB9IGVsc2UgaWYgKGdfc3RyX2VxdWFsKHBhdGgsICIvYmxhbmsuaWNv IikpIHsKICAgICAgICAgR093blB0cjxjaGFyPiBmaWxlUGF0aChnX2J1aWxkX2ZpbGVuYW1lKFRl c3Q6OmdldFdlYktpdDFUZXN0UmVzb3VjZXNEaXIoKS5kYXRhKCksIHBhdGgsIE5VTEwpKTsKICAg ICAgICAgY2hhciogY29udGVudHM7CkBAIC01MDIsNiArNTYwLDcgQEAgdm9pZCBiZWZvcmVBbGwo KQogICAgIFNpbmdsZVJlc291cmNlTG9hZFRlc3Q6OmFkZCgiV2ViS2l0V2ViUmVzb3VyY2UiLCAi bG9hZGluZyIsIHRlc3RXZWJSZXNvdXJjZUxvYWRpbmcpOwogICAgIFNpbmdsZVJlc291cmNlTG9h ZFRlc3Q6OmFkZCgiV2ViS2l0V2ViUmVzb3VyY2UiLCAicmVzcG9uc2UiLCB0ZXN0V2ViUmVzb3Vy Y2VSZXNwb25zZSk7CiAgICAgUmVzb3VyY2VVUklUcmFja2luZ1Rlc3Q6OmFkZCgiV2ViS2l0V2Vi UmVzb3VyY2UiLCAiYWN0aXZlLXVyaSIsIHRlc3RXZWJSZXNvdXJjZUFjdGl2ZVVSSSk7CisgICAg UmVzb3VyY2VzVGVzdDo6YWRkKCJXZWJLaXRXZWJSZXNvdXJjZSIsICJnZXQtZGF0YSIsIHRlc3RX ZWJSZXNvdXJjZUdldERhdGEpOwogfQogCiB2b2lkIGFmdGVyQWxsKCkK