19656 2008-06-18 08:45:44 -0700 [SOUP] The gio code should call didFail() instead of didFinishLoading() in case of error 2008-08-21 04:23:53 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 marco.barisione marco.barisione oldest_to_newest 83764 0 marco.barisione 2008-06-18 08:45:44 -0700 At the moment ther gio code in the soup back-end call didFinishLoading() in case of error, this should be changed to didFail(). 83765 1 21819 marco.barisione 2008-06-18 09:01:06 -0700 Created attachment 21819 Call didFail in case of error 87672 2 21819 eric 2008-08-02 01:11:00 -0700 Comment on attachment 21819 Call didFail in case of error We really should have a GOwnPtr which knows how to call g_free on the associated pointer. In that case: gchar* uri = g_file_get_uri (d->m_gfile); 519 ResourceError resourceError("webkit-network-error", ERROR_TRANSPORT, uri, String::fromUTF8(error->message)); 520 g_free(uri); would not need the g_free line. Stupid c-style memory management. Bleh. (No offense to your code, I just have a general hatred towards languages and APIs which make it easy for you to stab yourself in the foot, or leak memory.) WebKit style does not have a space between the function name and the ( + gchar* uri = g_file_get_uri (d->m_gfile); So we make 2 copies of the buffer just to send this URI off to ResourceError. Is it possible to avoid this? You should consider adding an inline function which created the resource error from the gfile handle and returned it to you. That would eliminate 6 lines of copy-paste code. Then these calls just become: client->didFail(handle, networkErrorForFile(d->m_gfile, error)); static inline ResourceError networkErrorForFile(gfile* file, gerror* error) { gchar* uri = g_file_get_uri(d->m_gfile); ResourceError resourceError("webkit-network-error", ERROR_TRANSPORT, uri, String::fromUTF8(error->message)); g_free(uri); return resourceError; } r- for the style errors. And I would encourage you to use a static inline to eliminate this copy-paste code. 87750 3 22629 marco.barisione 2008-08-04 04:45:45 -0700 Created attachment 22629 Call didFail in case of error Adding something like GOwnPtr and GObjectPtr could be a good idea but it's something for a separate patch. "So we make 2 copies of the buffer just to send this URI off to ResourceError. Is it possible to avoid this?" What do you mean? The copy from the GFile to a char and then to a String? In this case I don't see any solution. 88893 4 22629 mrowe 2008-08-19 22:15:31 -0700 Comment on attachment 22629 Call didFail in case of error r=me 89002 5 jmalonzo 2008-08-21 04:23:53 -0700 landed in r35872. Thanks for the patch and for the review! 21819 2008-06-18 09:01:06 -0700 2008-08-04 04:45:45 -0700 Call didFail in case of error gio-didFail.patch text/plain 4252 marco.barisione SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VI YW5kbGVTb3VwLmNwcAkocmV2aXNpb25lIDM0NTczKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAkoY29waWEgbG9jYWxlKQpAQCAtMSw2ICsx LDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggQWxwIFRva2VyIDxhbHBAYXRva2VyLmNv bT4KICAqIENvcHlyaWdodCAoQykgMjAwOCBYYW4gTG9wZXogPHhhbkBnbm9tZS5vcmc+CisgKiBD b3B5cmlnaHQgKEMpIDIwMDggQ29sbGFib3JhIEx0ZC4KICAqCiAgKiBUaGlzIGxpYnJhcnkgaXMg ZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiBtb2RpZnkg aXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAt NDMzLDkgKzQzNCwxMSBAQAogCiAgICAgbnJlYWQgPSBnX2lucHV0X3N0cmVhbV9yZWFkX2Zpbmlz aChkLT5tX2lucHV0X3N0cmVhbSwgcmVzLCAmZXJyb3IpOwogICAgIGlmIChlcnJvcikgeworICAg ICAgICBnY2hhciogdXJpID0gZ19maWxlX2dldF91cmkgKGQtPm1fZ2ZpbGUpOworICAgICAgICBS ZXNvdXJjZUVycm9yIHJlc291cmNlRXJyb3IoIndlYmtpdC1uZXR3b3JrLWVycm9yIiwgRVJST1Jf VFJBTlNQT1JULCB1cmksIFN0cmluZzo6ZnJvbVVURjgoZXJyb3ItPm1lc3NhZ2UpKTsKKyAgICAg ICAgZ19mcmVlKHVyaSk7CiAgICAgICAgIGNsZWFudXBHaW9PcGVyYXRpb24oaGFuZGxlKTsKLSAg ICAgICAgLy8gRklYTUU6IGVycm9yCi0gICAgICAgIGNsaWVudC0+ZGlkRmluaXNoTG9hZGluZyho YW5kbGUpOworICAgICAgICBjbGllbnQtPmRpZEZhaWwoaGFuZGxlLCByZXNvdXJjZUVycm9yKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0gZWxzZSBpZiAoIW5yZWFkKSB7CiAgICAgICAgIGNsaWVu dC0+ZGlkRmluaXNoTG9hZGluZyhoYW5kbGUpOwpAQCAtNDY3LDkgKzQ3MCwxMSBAQAogICAgIEdF cnJvciAqZXJyb3IgPSBOVUxMOwogICAgIGluID0gZ19maWxlX3JlYWRfZmluaXNoKEdfRklMRShz b3VyY2UpLCByZXMsICZlcnJvcik7CiAgICAgaWYgKGVycm9yKSB7CisgICAgICAgIGdjaGFyKiB1 cmkgPSBnX2ZpbGVfZ2V0X3VyaSAoZC0+bV9nZmlsZSk7CisgICAgICAgIFJlc291cmNlRXJyb3Ig cmVzb3VyY2VFcnJvcigid2Via2l0LW5ldHdvcmstZXJyb3IiLCBFUlJPUl9UUkFOU1BPUlQsIHVy aSwgU3RyaW5nOjpmcm9tVVRGOChlcnJvci0+bWVzc2FnZSkpOworICAgICAgICBnX2ZyZWUodXJp KTsKICAgICAgICAgY2xlYW51cEdpb09wZXJhdGlvbihoYW5kbGUpOwotICAgICAgICAvLyBGSVhN RTogZXJyb3IKLSAgICAgICAgY2xpZW50LT5kaWRGaW5pc2hMb2FkaW5nKGhhbmRsZSk7CisgICAg ICAgIGNsaWVudC0+ZGlkRmFpbChoYW5kbGUsIHJlc291cmNlRXJyb3IpOwogICAgICAgICByZXR1 cm47CiAgICAgfQogCkBAIC01MTAsMjMgKzUxNSwxMSBAQAogICAgICAgICAvLyBhbmQgc2V0IGEg dGltZW91dCB0byB1bm1vdW50IGl0IGxhdGVyIGFmdGVyIGl0J3MgYmVlbiBpZGxlCiAgICAgICAg IC8vIGZvciBhIHdoaWxlKS4KIAorICAgICAgICBnY2hhciogdXJpID0gZ19maWxlX2dldF91cmkg KGQtPm1fZ2ZpbGUpOworICAgICAgICBSZXNvdXJjZUVycm9yIHJlc291cmNlRXJyb3IoIndlYmtp dC1uZXR3b3JrLWVycm9yIiwgRVJST1JfVFJBTlNQT1JULCB1cmksIFN0cmluZzo6ZnJvbVVURjgo ZXJyb3ItPm1lc3NhZ2UpKTsKKyAgICAgICAgZ19mcmVlKHVyaSk7CiAgICAgICAgIGNsZWFudXBH aW9PcGVyYXRpb24oaGFuZGxlKTsKLQotICAgICAgICBpZiAoZXJyb3ItPmRvbWFpbiA9PSBHX0lP X0VSUk9SICYmCi0gICAgICAgICAgICBlcnJvci0+Y29kZSA9PSBHX0lPX0VSUk9SX05PVF9GT1VO RCkKLSAgICAgICAgICAgIHJlc3BvbnNlLnNldEhUVFBTdGF0dXNDb2RlKFNPVVBfU1RBVFVTX05P VF9GT1VORCk7Ci0gICAgICAgIGVsc2UgaWYgKGVycm9yLT5kb21haW4gPT0gR19JT19FUlJPUiAm JgotICAgICAgICAgICAgICAgICBlcnJvci0+Y29kZSA9PSBHX0lPX0VSUk9SX1BFUk1JU1NJT05f REVOSUVEKQotICAgICAgICAgICAgcmVzcG9uc2Uuc2V0SFRUUFN0YXR1c0NvZGUoU09VUF9TVEFU VVNfRk9SQklEREVOKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmVzcG9uc2Uuc2V0SFRU UFN0YXR1c0NvZGUoU09VUF9TVEFUVVNfQkFEX1JFUVVFU1QpOyAvLyA/Ci0gICAgICAgIGdfZXJy b3JfZnJlZShlcnJvcik7Ci0KLSAgICAgICAgLy8gRklYTUU6IGRvIHdlIG5lZWQgdG8gZmFrZSB1 cCBhIHJlc3BvbnNlIGJvZHkgY29udGFpbmluZyB0aGUKLSAgICAgICAgLy8gZXJyb3IgbWVzc2Fn ZT8KLQotICAgICAgICBjbGllbnQtPmRpZFJlY2VpdmVSZXNwb25zZShoYW5kbGUsIHJlc3BvbnNl KTsKLSAgICAgICAgY2xpZW50LT5kaWRGaW5pc2hMb2FkaW5nKGhhbmRsZSk7CisgICAgICAgIGNs aWVudC0+ZGlkRmFpbChoYW5kbGUsIHJlc291cmNlRXJyb3IpOwogICAgICAgICByZXR1cm47CiAg ICAgfQogCkBAIC01MzQsMTAgKzUyNywxMyBAQAogICAgICAgICAvLyBGSVhNRTogd2hhdCBpZiB0 aGUgVVJJIHBvaW50cyB0byBhIGRpcmVjdG9yeT8gU2hvdWxkIHdlCiAgICAgICAgIC8vIGdlbmVy YXRlIGEgbGlzdGluZz8gSG93PyBXaGF0IGRvIG90aGVyIGJhY2tlbmRzIGRvIGhlcmU/CiAKKyAg ICAgICAgZ2NoYXIqIHVyaSA9IGdfZmlsZV9nZXRfdXJpIChkLT5tX2dmaWxlKTsKKyAgICAgICAg Ly8gRklYTUU6IE1hcCBnaW8gZXJyb3JzIHRvIGEgbW9yZSBkZXRhaWxlZCBlcnJvciBjb2RlIHdo ZW4gd2UgaGF2ZSBpdCBpbgorICAgICAgICAvLyBXZWJLaXQuCisgICAgICAgIFJlc291cmNlRXJy b3IgZXJyb3IoIndlYmtpdC1uZXR3b3JrLWVycm9yIiwgRVJST1JfVFJBTlNQT1JULCB1cmksICJD YW5ub3Qgc2hvdyBub24tZmlsZXMiKTsKKyAgICAgICAgZ19mcmVlKHVyaSk7CiAgICAgICAgIGNs ZWFudXBHaW9PcGVyYXRpb24oaGFuZGxlKTsKLSAgICAgICAgcmVzcG9uc2Uuc2V0SFRUUFN0YXR1 c0NvZGUoU09VUF9TVEFUVVNfRk9SQklEREVOKTsgLy8gPwotICAgICAgICBjbGllbnQtPmRpZFJl Y2VpdmVSZXNwb25zZShoYW5kbGUsIHJlc3BvbnNlKTsKLSAgICAgICAgY2xpZW50LT5kaWRGaW5p c2hMb2FkaW5nKGhhbmRsZSk7CisgICAgICAgIGNsaWVudC0+ZGlkRmFpbChoYW5kbGUsIGVycm9y KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uZSAzNDY0NikKKysrIFdlYkNv cmUvQ2hhbmdlTG9nCShjb3BpYSBsb2NhbGUpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDgtMDYtMTgg IE1hcmNvIEJhcmlzaW9uZSAgPG1hcmNvLmJhcmlzaW9uZUBjb2xsYWJvcmEuY28udWs+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cDovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2NTYKKyAgICAgICAgW1NPVVBdIFRoZSBnaW8g Y29kZSBzaG91bGQgY2FsbCBkaWRGYWlsKCkgaW5zdGVhZCBvZgorICAgICAgICBkaWRGaW5pc2hM b2FkaW5nKCkgaW4gY2FzZSBvZiBlcnJvcgorCisgICAgICAgIEluIGNhc2Ugb2YgZXJyb3IgY2Fs bCBkaWRGYWlsKCkgaW5zdGVhZCBvZiBkaWRSZWNlaXZlUmVzcG9uc2UoKSBhbmQKKyAgICAgICAg ZGlkRmluaXNoTG9hZGluZygpLgorCisgICAgICAgICogQ2hhbmdlTG9nOgorICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6cmVhZENhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6Om9wZW5DYWxsYmFjayk6Cisg ICAgICAgIChXZWJDb3JlOjpxdWVyeUluZm9DYWxsYmFjayk6CisKIDIwMDgtMDYtMTggIENocmlz dGlhbiBEeXdhbiAgPGNocmlzdGlhbkB0d290b2FzdHMuZGU+CiAKICAgICAgICAgR3RrIGJ1aWxk IGZpeCwgYnJvdWdodCB1cCBieSBEaXJrIFNjaHVsemUuCg== 22629 2008-08-04 04:45:45 -0700 2008-08-19 22:15:31 -0700 Call didFail in case of error gio-didFail.patch text/plain 4121 marco.barisione ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTMyYTUxZS4uZTFlM2NiZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAwOC0wOC0wNCAgTWFyY28gQmFyaXNp b25lICA8bWFyY28uYmFyaXNpb25lQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTY1NgorICAgICAgICBbU09VUF0gVGhlIGdpbyBjb2RlIHNob3VsZCBj YWxsIGRpZEZhaWwoKSBpbnN0ZWFkIG9mCisgICAgICAgIGRpZEZpbmlzaExvYWRpbmcoKSBpbiBj YXNlIG9mIGVycm9yCisKKyAgICAgICAgSW4gY2FzZSBvZiBlcnJvciBjYWxsIGRpZEZhaWwoKSBp bnN0ZWFkIG9mIGRpZFJlY2VpdmVSZXNwb25zZSgpIGFuZAorICAgICAgICBkaWRGaW5pc2hMb2Fk aW5nKCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVT b3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om5ldHdvcmtFcnJvckZvckZpbGUpOgorICAgICAg ICAoV2ViQ29yZTo6cmVhZENhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6Om9wZW5DYWxsYmFj ayk6CisgICAgICAgIChXZWJDb3JlOjpxdWVyeUluZm9DYWxsYmFjayk6CisKIDIwMDgtMDgtMDIg IE1heGltZSBCcml0dG8gIDxicml0dG9AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAv UmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jl c291cmNlSGFuZGxlU291cC5jcHAKaW5kZXggMDI1ZTBjOS4uMWNkZjZmYyAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCkBA IC0zODcsNiArMzg3LDE1IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OmxvYWRSZXNvdXJjZVN5bmNo cm9ub3VzbHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiwgUmVzb3VyY2VFCiAKIC8vIEdJTy1iYXNl ZCBsb2FkZXIKIAorc3RhdGljIGlubGluZSBSZXNvdXJjZUVycm9yIG5ldHdvcmtFcnJvckZvckZp bGUoR0ZpbGUqIGZpbGUsIEdFcnJvciogZXJyb3IpCit7CisgICAgLy8gRklYTUU6IE1hcCBnaW8g ZXJyb3JzIHRvIGEgbW9yZSBkZXRhaWxlZCBlcnJvciBjb2RlIHdoZW4gd2UgaGF2ZSBpdCBpbiBX ZWJLaXQuCisgICAgZ2NoYXIqIHVyaSA9IGdfZmlsZV9nZXRfdXJpKGZpbGUpOworICAgIFJlc291 cmNlRXJyb3IgcmVzb3VyY2VFcnJvcigid2Via2l0LW5ldHdvcmstZXJyb3IiLCBFUlJPUl9UUkFO U1BPUlQsIHVyaSwgU3RyaW5nOjpmcm9tVVRGOChlcnJvci0+bWVzc2FnZSkpOworICAgIGdfZnJl ZSh1cmkpOworICAgIHJldHVybiByZXNvdXJjZUVycm9yOworfQorCiBzdGF0aWMgdm9pZCBjbGVh bnVwR2lvT3BlcmF0aW9uKFJlc291cmNlSGFuZGxlKiBoYW5kbGUpCiB7CiAgICAgUmVzb3VyY2VI YW5kbGVJbnRlcm5hbCogZCA9IGhhbmRsZS0+Z2V0SW50ZXJuYWwoKTsKQEAgLTQzNiw5ICs0NDUs OCBAQCBzdGF0aWMgdm9pZCByZWFkQ2FsbGJhY2soR09iamVjdCogc291cmNlLCBHQXN5bmNSZXN1 bHQqIHJlcywgZ3BvaW50ZXIgZGF0YSkKIAogICAgIG5yZWFkID0gZ19pbnB1dF9zdHJlYW1fcmVh ZF9maW5pc2goZC0+bV9pbnB1dF9zdHJlYW0sIHJlcywgJmVycm9yKTsKICAgICBpZiAoZXJyb3Ip IHsKKyAgICAgICAgY2xpZW50LT5kaWRGYWlsKGhhbmRsZSwgbmV0d29ya0Vycm9yRm9yRmlsZShk LT5tX2dmaWxlLCBlcnJvcikpOwogICAgICAgICBjbGVhbnVwR2lvT3BlcmF0aW9uKGhhbmRsZSk7 Ci0gICAgICAgIC8vIEZJWE1FOiBlcnJvcgotICAgICAgICBjbGllbnQtPmRpZEZpbmlzaExvYWRp bmcoaGFuZGxlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0gZWxzZSBpZiAoIW5yZWFkKSB7CiAg ICAgICAgIGdfaW5wdXRfc3RyZWFtX2Nsb3NlX2FzeW5jKGQtPm1faW5wdXRfc3RyZWFtLCBHX1BS SU9SSVRZX0RFRkFVTFQsCkBAIC00NjksOSArNDc3LDggQEAgc3RhdGljIHZvaWQgb3BlbkNhbGxi YWNrKEdPYmplY3QqIHNvdXJjZSwgR0FzeW5jUmVzdWx0KiByZXMsIGdwb2ludGVyIGRhdGEpCiAg ICAgR0Vycm9yICplcnJvciA9IE5VTEw7CiAgICAgaW4gPSBnX2ZpbGVfcmVhZF9maW5pc2goR19G SUxFKHNvdXJjZSksIHJlcywgJmVycm9yKTsKICAgICBpZiAoZXJyb3IpIHsKKyAgICAgICAgY2xp ZW50LT5kaWRGYWlsKGhhbmRsZSwgbmV0d29ya0Vycm9yRm9yRmlsZShkLT5tX2dmaWxlLCBlcnJv cikpOwogICAgICAgICBjbGVhbnVwR2lvT3BlcmF0aW9uKGhhbmRsZSk7Ci0gICAgICAgIC8vIEZJ WE1FOiBlcnJvcgotICAgICAgICBjbGllbnQtPmRpZEZpbmlzaExvYWRpbmcoaGFuZGxlKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNTEyLDIzICs1MTksOCBAQCBzdGF0aWMgdm9pZCBx dWVyeUluZm9DYWxsYmFjayhHT2JqZWN0KiBzb3VyY2UsIEdBc3luY1Jlc3VsdCogcmVzLCBncG9p bnRlciBkYXRhKQogICAgICAgICAvLyBhbmQgc2V0IGEgdGltZW91dCB0byB1bm1vdW50IGl0IGxh dGVyIGFmdGVyIGl0J3MgYmVlbiBpZGxlCiAgICAgICAgIC8vIGZvciBhIHdoaWxlKS4KIAorICAg ICAgICBjbGllbnQtPmRpZEZhaWwoaGFuZGxlLCBuZXR3b3JrRXJyb3JGb3JGaWxlKGQtPm1fZ2Zp bGUsIGVycm9yKSk7CiAgICAgICAgIGNsZWFudXBHaW9PcGVyYXRpb24oaGFuZGxlKTsKLQotICAg ICAgICBpZiAoZXJyb3ItPmRvbWFpbiA9PSBHX0lPX0VSUk9SICYmCi0gICAgICAgICAgICBlcnJv ci0+Y29kZSA9PSBHX0lPX0VSUk9SX05PVF9GT1VORCkKLSAgICAgICAgICAgIHJlc3BvbnNlLnNl dEhUVFBTdGF0dXNDb2RlKFNPVVBfU1RBVFVTX05PVF9GT1VORCk7Ci0gICAgICAgIGVsc2UgaWYg KGVycm9yLT5kb21haW4gPT0gR19JT19FUlJPUiAmJgotICAgICAgICAgICAgICAgICBlcnJvci0+ Y29kZSA9PSBHX0lPX0VSUk9SX1BFUk1JU1NJT05fREVOSUVEKQotICAgICAgICAgICAgcmVzcG9u c2Uuc2V0SFRUUFN0YXR1c0NvZGUoU09VUF9TVEFUVVNfRk9SQklEREVOKTsKLSAgICAgICAgZWxz ZQotICAgICAgICAgICAgcmVzcG9uc2Uuc2V0SFRUUFN0YXR1c0NvZGUoU09VUF9TVEFUVVNfQkFE X1JFUVVFU1QpOyAvLyA/Ci0gICAgICAgIGdfZXJyb3JfZnJlZShlcnJvcik7Ci0KLSAgICAgICAg Ly8gRklYTUU6IGRvIHdlIG5lZWQgdG8gZmFrZSB1cCBhIHJlc3BvbnNlIGJvZHkgY29udGFpbmlu ZyB0aGUKLSAgICAgICAgLy8gZXJyb3IgbWVzc2FnZT8KLQotICAgICAgICBjbGllbnQtPmRpZFJl Y2VpdmVSZXNwb25zZShoYW5kbGUsIHJlc3BvbnNlKTsKLSAgICAgICAgY2xpZW50LT5kaWRGaW5p c2hMb2FkaW5nKGhhbmRsZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTUzNiwxMCAr NTI4LDggQEAgc3RhdGljIHZvaWQgcXVlcnlJbmZvQ2FsbGJhY2soR09iamVjdCogc291cmNlLCBH QXN5bmNSZXN1bHQqIHJlcywgZ3BvaW50ZXIgZGF0YSkKICAgICAgICAgLy8gRklYTUU6IHdoYXQg aWYgdGhlIFVSSSBwb2ludHMgdG8gYSBkaXJlY3Rvcnk/IFNob3VsZCB3ZQogICAgICAgICAvLyBn ZW5lcmF0ZSBhIGxpc3Rpbmc/IEhvdz8gV2hhdCBkbyBvdGhlciBiYWNrZW5kcyBkbyBoZXJlPwog CisgICAgICAgIGNsaWVudC0+ZGlkRmFpbChoYW5kbGUsIG5ldHdvcmtFcnJvckZvckZpbGUoZC0+ bV9nZmlsZSwgZXJyb3IpKTsKICAgICAgICAgY2xlYW51cEdpb09wZXJhdGlvbihoYW5kbGUpOwot ICAgICAgICByZXNwb25zZS5zZXRIVFRQU3RhdHVzQ29kZShTT1VQX1NUQVRVU19GT1JCSURERU4p OyAvLyA/Ci0gICAgICAgIGNsaWVudC0+ZGlkUmVjZWl2ZVJlc3BvbnNlKGhhbmRsZSwgcmVzcG9u c2UpOwotICAgICAgICBjbGllbnQtPmRpZEZpbmlzaExvYWRpbmcoaGFuZGxlKTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAo=