48620 2010-10-29 01:40:00 -0700 [Qt] WebKit2 needs to support historyitem, QWKHistoryItem 2010-11-01 18:15:35 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 juha.savolainen webkit-unassigned commit-queue kenneth kling oldest_to_newest 301632 0 juha.savolainen 2010-10-29 01:40:00 -0700 The QWKHistoryItem class represents one item in the history of a QWKPage. 301633 1 72299 juha.savolainen 2010-10-29 01:45:38 -0700 Created attachment 72299 Implementation of QWKHistoryItem 302275 2 72299 kenneth 2010-10-30 02:11:17 -0700 Comment on attachment 72299 Implementation of QWKHistoryItem View in context: https://bugs.webkit.org/attachment.cgi?id=72299&action=review > WebKit2/UIProcess/API/qt/qwkhistory.cpp:46 > +QWKHistoryItemPrivate::~QWKHistoryItemPrivate() > +{ > +} Why not just use the default destructor. > WebKit2/UIProcess/API/qt/qwkhistory.cpp:59 > +QString QWKHistoryItem::title() const > +{ > + return WKStringCopyQString(WKBackForwardListItemCopyTitle(d->m_backForwardListItem)); > +} I think that you are leaking here. As you are not freeing the WKString. Do something like: WKRetainPtr<WKString> string = WKBackForwardListItemCopyTitle(d->m_backForwardListItem); return WKStringCopyQString(string); When the WKRetainPtr goes out of scope, it will free the string. > WebKit2/UIProcess/API/qt/qwkhistory_p.h:43 > + WKBackForwardListItemRef m_backForwardListItem; Don't you need to ref this one? ie. change this into a WKRetainPtr<WKBackForwardListItemRef>? 302606 3 juha.savolainen 2010-11-01 05:36:52 -0700 (In reply to comment #2) > (From update of attachment 72299 [details]) > > WebKit2/UIProcess/API/qt/qwkhistory.cpp:59 > > +QString QWKHistoryItem::title() const > > +{ > > + return WKStringCopyQString(WKBackForwardListItemCopyTitle(d->m_backForwardListItem)); > > +} > > I think that you are leaking here. As you are not freeing the WKString. Also I noticed that I forgot to do checkings: if (!d->m_backForwardListItem) return QString(); 302626 4 72501 juha.savolainen 2010-11-01 06:16:35 -0700 Created attachment 72501 Fixed patch Fixed patch. 303137 5 commit-queue 2010-11-01 18:14:15 -0700 The commit-queue encountered the following flaky tests while processing attachment 72501: media/event-attributes.html Please file bugs against the tests. These tests were authored by eric.carlson@apple.com. The commit-queue is continuing to process your patch. 303138 6 72501 commit-queue 2010-11-01 18:15:29 -0700 Comment on attachment 72501 Fixed patch Clearing flags on attachment: 72501 Committed r71089: <http://trac.webkit.org/changeset/71089> 303139 7 commit-queue 2010-11-01 18:15:35 -0700 All reviewed patches have been landed. Closing bug. 72299 2010-10-29 01:45:38 -0700 2010-11-01 06:16:35 -0700 Implementation of QWKHistoryItem qwkhistoryitem.patch text/plain 4911 juha.savolainen SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MDg0OCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTAtMTAtMjkgIEp1aGEgU2F2b2xhaW5lbiAgPGp1aGEuc2F2b2xh aW5lbkB3ZWVnby5maT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJbml0aWFsIGltcGxlbWVudGF0aW9uIG9mIFFXS0hpc3RvcnlJdGVtLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg2MjAKKworICAgICAg ICBUaGUgUVdrSGlzdG9yeUl0ZW0gcmVwcmVzZW50cyBvbmUgaXRlbSBpbiB0aGUgaGlzdG9yeSBv ZiBRV0tQYWdlLgorICAgICAgICAKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3a2hpc3Rv cnkuY3BwOgorICAgICAgICAoUVdLSGlzdG9yeUl0ZW1Qcml2YXRlOjpRV0tIaXN0b3J5SXRlbVBy aXZhdGUpOgorICAgICAgICAoUVdLSGlzdG9yeUl0ZW1Qcml2YXRlOjp+UVdLSGlzdG9yeUl0ZW1Q cml2YXRlKToKKyAgICAgICAgKFFXS0hpc3RvcnlJdGVtOjpRV0tIaXN0b3J5SXRlbSk6CisgICAg ICAgIChRV0tIaXN0b3J5SXRlbTo6flFXS0hpc3RvcnlJdGVtKToKKyAgICAgICAgKFFXS0hpc3Rv cnlJdGVtOjp0aXRsZSk6IFRoZSBwYWdlIHRpdGxlCisgICAgICAgIChRV0tIaXN0b3J5SXRlbTo6 dXJsKTogVGhlIFVSTCBvZiB0aGUgcGFnZS4KKyAgICAgICAgKFFXS0hpc3RvcnlJdGVtOjpvcmln aW5hbFVybCk6IFRoZSBVUkwgdXNlZCB0byBhY2Nlc3MgdGhlIHBhZ2UuCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9x d2toaXN0b3J5X3AuaDoKKyAgICAgICAgKiBXZWJLaXQyLnBybzogQWRkZWQgV0tCYWNrRm9yd2Fy ZExpc3RJdGVtLmggYW5kIFdLQmFja0ZvcndhcmRMaXN0SXRlbS5jcHAKKwogMjAxMC0xMC0yOCAg RGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIExMVk0gY29tcGlsZXIg YnVpbGQgZml4CkluZGV4OiBXZWJLaXQyL1dlYktpdDIucHJvCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dDIvV2ViS2l0Mi5wcm8JKHJldmlzaW9uIDcwODQyKQorKysgV2ViS2l0Mi9XZWJLaXQyLnBybwko d29ya2luZyBjb3B5KQpAQCAtMjI4LDYgKzIyOCw3IEBAIEhFQURFUlMgKz0gXAogICAgIFVJUHJv Y2Vzcy9BUEkvQy9XZWJLaXQyLmggXAogICAgIFVJUHJvY2Vzcy9BUEkvQy9XS0FQSUNhc3QuaCBc CiAgICAgVUlQcm9jZXNzL0FQSS9DL1dLQmFja0ZvcndhcmRMaXN0LmggXAorICAgIFVJUHJvY2Vz cy9BUEkvQy9XS0JhY2tGb3J3YXJkTGlzdEl0ZW0uaCBcCiAgICAgVUlQcm9jZXNzL0FQSS9DL1dL Q29udGV4dC5oIFwKICAgICBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0UHJpdmF0ZS5oIFwKICAg ICBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5oIFwKQEAgLTM5MCw2ICszOTEsNyBAQCBTT1VSQ0VT ICs9IFwKICAgICBTaGFyZWQvV2ViVVJMUmVzcG9uc2UuY3BwIFwKICAgICBTaGFyZWQvV2ViV2hl ZWxFdmVudC5jcHAgXAogICAgIFVJUHJvY2Vzcy9BUEkvQy9XS0JhY2tGb3J3YXJkTGlzdC5jcHAg XAorICAgIFVJUHJvY2Vzcy9BUEkvQy9XS0JhY2tGb3J3YXJkTGlzdEl0ZW0uY3BwIFwKICAgICBV SVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcCBcCiAgICAgVUlQcm9jZXNzL0FQSS9DL1dLRnJh bWUuY3BwIFwKICAgICBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZVBvbGljeUxpc3RlbmVyLmNwcCBc CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdraGlzdG9yeS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnkuY3BwCShyZXZpc2lvbiA3 MDg0MikKKysrIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjYsMTEgKzI2LDQ4IEBACiAjaW5jbHVkZSAicXdraGlzdG9yeS5oIgogCiAj aW5jbHVkZSAiV0tCYWNrRm9yd2FyZExpc3QuaCIKKyNpbmNsdWRlICJXS0JhY2tGb3J3YXJkTGlz dEl0ZW0uaCIKKyNpbmNsdWRlICJXS1N0cmluZ1F0LmgiCisjaW5jbHVkZSAiV0tVUkxRdC5oIgog I2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdC5oIgogI2luY2x1ZGUgInF3a2hpc3RvcnlfcC5o IgorI2luY2x1ZGUgPFFTdHJpbmc+CisjaW5jbHVkZSA8UVVybD4KIAogdXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKIAorUVdLSGlzdG9yeUl0ZW1Qcml2YXRlOjpRV0tIaXN0b3J5SXRlbVByaXZhdGUo V0tCYWNrRm9yd2FyZExpc3RJdGVtUmVmIGxpc3RJdGVtKQorICAgIDogbV9iYWNrRm9yd2FyZExp c3RJdGVtKGxpc3RJdGVtKQoreworfQorCitRV0tIaXN0b3J5SXRlbVByaXZhdGU6On5RV0tIaXN0 b3J5SXRlbVByaXZhdGUoKQoreworfQorCitRV0tIaXN0b3J5SXRlbTo6UVdLSGlzdG9yeUl0ZW0o KQoreworfQorCitRV0tIaXN0b3J5SXRlbTo6flFXS0hpc3RvcnlJdGVtKCkKK3sKK30KKworUVN0 cmluZyBRV0tIaXN0b3J5SXRlbTo6dGl0bGUoKSBjb25zdAoreworICAgIHJldHVybiBXS1N0cmlu Z0NvcHlRU3RyaW5nKFdLQmFja0ZvcndhcmRMaXN0SXRlbUNvcHlUaXRsZShkLT5tX2JhY2tGb3J3 YXJkTGlzdEl0ZW0pKTsKK30KKworUVVybCBRV0tIaXN0b3J5SXRlbTo6dXJsKCkgY29uc3QKK3sK KyAgICByZXR1cm4gV0tVUkxDb3B5UVVybChXS0JhY2tGb3J3YXJkTGlzdEl0ZW1Db3B5VVJMKGQt Pm1fYmFja0ZvcndhcmRMaXN0SXRlbSkpOworfQorCitRVXJsIFFXS0hpc3RvcnlJdGVtOjpvcmln aW5hbFVybCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIFdLVVJMQ29weVFVcmwoV0tCYWNrRm9yd2Fy ZExpc3RJdGVtQ29weU9yaWdpbmFsVVJMKGQtPm1fYmFja0ZvcndhcmRMaXN0SXRlbSkpOworfQor CiBRV0tIaXN0b3J5UHJpdmF0ZTo6UVdLSGlzdG9yeVByaXZhdGUoV2ViS2l0OjpXZWJCYWNrRm9y d2FyZExpc3QqIGxpc3QpCiAgICAgOiBtX2JhY2tGb3J3YXJkTGlzdChsaXN0KQogewpJbmRleDog V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnkuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdraGlzdG9yeS5oCShyZXZpc2lvbiA3MDg0MikKKysrIFdl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5LmgJKHdvcmtpbmcgY29weSkKQEAgLTI5 LDExICsyOSwzMCBAQAogI2luY2x1ZGUgPFFPYmplY3Q+CiAKIGNsYXNzIFFXS0hpc3RvcnlQcml2 YXRlOworY2xhc3MgUVdLSGlzdG9yeUl0ZW1Qcml2YXRlOworY2xhc3MgUVVybDsKK2NsYXNzIFFT dHJpbmc7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0Owog fQogCitjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV0tIaXN0b3J5SXRlbSB7CitwdWJsaWM6CisgICAg flFXS0hpc3RvcnlJdGVtKCk7CisgICAgUVN0cmluZyB0aXRsZSgpIGNvbnN0OworICAgIFFVcmwg dXJsKCkgY29uc3Q7CisgICAgUVVybCBvcmlnaW5hbFVybCgpIGNvbnN0OworCitwcml2YXRlOgor ICAgIFFXS0hpc3RvcnlJdGVtKCk7CisKKyAgICBRV0tIaXN0b3J5SXRlbVByaXZhdGUqIGQ7CisK KyAgICBmcmllbmQgY2xhc3MgUVdLSGlzdG9yeTsKKyAgICBmcmllbmQgY2xhc3MgUVdLSGlzdG9y eUl0ZW1Qcml2YXRlOworfTsKKwogY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdLSGlzdG9yeSA6IHB1 YmxpYyBRT2JqZWN0IHsKICAgICBRX09CSkVDVAogcHVibGljOgpJbmRleDogV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnlfcC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xd2toaXN0b3J5X3AuaAkocmV2aXNpb24gNzA4NDIpCisrKyBXZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXdraGlzdG9yeV9wLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2 LDggQEAKICNkZWZpbmUgcXdraGlzdG9yeV9wX2gKIAogI2luY2x1ZGUgInF3ZWJraXRnbG9iYWwu aCIKKyNpbmNsdWRlIDxXZWJLaXQyL1dLQmFzZS5oPgorI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRy Lmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0OwpAQCAt MzMsNiArMzUsMTcgQEAgY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0OwogCiBjbGFzcyBRV0tIaXN0 b3J5OwogCitjbGFzcyBRV0VCS0lUX0VYUE9SVCBRV0tIaXN0b3J5SXRlbVByaXZhdGUgeworcHJp dmF0ZToKKyAgICBRV0tIaXN0b3J5SXRlbVByaXZhdGUoV0tCYWNrRm9yd2FyZExpc3RJdGVtUmVm IGxpc3RJdGVtKTsKKyAgICB+UVdLSGlzdG9yeUl0ZW1Qcml2YXRlKCk7CisKKyAgICBXS0JhY2tG b3J3YXJkTGlzdEl0ZW1SZWYgbV9iYWNrRm9yd2FyZExpc3RJdGVtOworCisgICAgZnJpZW5kIGNs YXNzIFFXS0hpc3Rvcnk7CisgICAgZnJpZW5kIGNsYXNzIFFXS0hpc3RvcnlJdGVtOworfTsKKwog Y2xhc3MgUVdFQktJVF9FWFBPUlQgUVdLSGlzdG9yeVByaXZhdGUgewogcHVibGljOgogICAgIHN0 YXRpYyBRV0tIaXN0b3J5KiBjcmVhdGVIaXN0b3J5KFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0 KiBsaXN0KTsK 72501 2010-11-01 06:16:35 -0700 2010-11-01 18:15:29 -0700 Fixed patch qwkhistoryitem.diff text/plain 5200 juha.savolainen SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA3MTAxNSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMTEtMDEgIEp1aGEgU2F2b2xhaW5lbiAgPGp1aGEuc2F2b2xh aW5lbkB3ZWVnby5maT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJbml0aWFsIGltcGxlbWVudGF0aW9uIG9mIFFXS0hpc3RvcnlJdGVtLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg2MjAKKworICAgICAg ICBUaGUgUVdrSGlzdG9yeUl0ZW0gcmVwcmVzZW50cyBvbmUgaXRlbSBpbiB0aGUgaGlzdG9yeSBv ZiBRV0tQYWdlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5LmNwcDoK KyAgICAgICAgKFFXS0hpc3RvcnlJdGVtUHJpdmF0ZTo6UVdLSGlzdG9yeUl0ZW1Qcml2YXRlKToK KyAgICAgICAgKFFXS0hpc3RvcnlJdGVtOjpRV0tIaXN0b3J5SXRlbSk6CisgICAgICAgIChRV0tI aXN0b3J5SXRlbTo6flFXS0hpc3RvcnlJdGVtKToKKyAgICAgICAgKFFXS0hpc3RvcnlJdGVtOjp0 aXRsZSk6IFRoZSBwYWdlIHRpdGxlCisgICAgICAgIChRV0tIaXN0b3J5SXRlbTo6dXJsKTogVGhl IFVSTCBvZiB0aGUgcGFnZS4KKyAgICAgICAgKFFXS0hpc3RvcnlJdGVtOjpvcmlnaW5hbFVybCk6 IFRoZSBVUkwgdXNlZCB0byBhY2Nlc3MgdGhlIHBhZ2UuCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9xdC9xd2toaXN0b3J5Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5 X3AuaDoKKyAgICAgICAgKiBXZWJLaXQyLnBybzogQWRkZWQgV0tCYWNrRm9yd2FyZExpc3RJdGVt LmggYW5kIFdLQmFja0ZvcndhcmRMaXN0SXRlbS5jcHAKKwogMjAxMC0xMC0zMSAgRGFyaW4gQWRs ZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVp bi4KSW5kZXg6IFdlYktpdDIvV2ViS2l0Mi5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJL aXQyLnBybwkocmV2aXNpb24gNzEwMTMpCisrKyBXZWJLaXQyL1dlYktpdDIucHJvCSh3b3JraW5n IGNvcHkpCkBAIC0yMjksNiArMjI5LDcgQEAgSEVBREVSUyArPSBcCiAgICAgVUlQcm9jZXNzL0FQ SS9DL1dlYktpdDIuaCBcCiAgICAgVUlQcm9jZXNzL0FQSS9DL1dLQVBJQ2FzdC5oIFwKICAgICBV SVByb2Nlc3MvQVBJL0MvV0tCYWNrRm9yd2FyZExpc3QuaCBcCisgICAgVUlQcm9jZXNzL0FQSS9D L1dLQmFja0ZvcndhcmRMaXN0SXRlbS5oIFwKICAgICBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0 LmggXAogICAgIFVJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRQcml2YXRlLmggXAogICAgIFVJUHJv Y2Vzcy9BUEkvQy9XS0ZyYW1lLmggXApAQCAtMzkxLDYgKzM5Miw3IEBAIFNPVVJDRVMgKz0gXAog ICAgIFNoYXJlZC9XZWJVUkxSZXNwb25zZS5jcHAgXAogICAgIFNoYXJlZC9XZWJXaGVlbEV2ZW50 LmNwcCBcCiAgICAgVUlQcm9jZXNzL0FQSS9DL1dLQmFja0ZvcndhcmRMaXN0LmNwcCBcCisgICAg VUlQcm9jZXNzL0FQSS9DL1dLQmFja0ZvcndhcmRMaXN0SXRlbS5jcHAgXAogICAgIFVJUHJvY2Vz cy9BUEkvQy9XS0NvbnRleHQuY3BwIFwKICAgICBVSVByb2Nlc3MvQVBJL0MvV0tGcmFtZS5jcHAg XAogICAgIFVJUHJvY2Vzcy9BUEkvQy9XS0ZyYW1lUG9saWN5TGlzdGVuZXIuY3BwIFwKSW5kZXg6 IFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2toaXN0b3J5LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdraGlzdG9yeS5jcHAJKHJldmlzaW9uIDcxMDEzKQor KysgV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnkuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yNiwxMSArMjYsNTUgQEAKICNpbmNsdWRlICJxd2toaXN0b3J5LmgiCiAKICNpbmNsdWRl ICJXS0JhY2tGb3J3YXJkTGlzdC5oIgorI2luY2x1ZGUgIldLQmFja0ZvcndhcmRMaXN0SXRlbS5o IgorI2luY2x1ZGUgIldLU3RyaW5nUXQuaCIKKyNpbmNsdWRlICJXS1VSTC5oIgorI2luY2x1ZGUg IldLVVJMUXQuaCIKICNpbmNsdWRlICJXZWJCYWNrRm9yd2FyZExpc3QuaCIKICNpbmNsdWRlICJx d2toaXN0b3J5X3AuaCIKKyNpbmNsdWRlIDxRU3RyaW5nPgorI2luY2x1ZGUgPFFVcmw+CisjaW5j bHVkZSA8V2ViS2l0Mi9XS1JldGFpblB0ci5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0Owog CitRV0tIaXN0b3J5SXRlbVByaXZhdGU6OlFXS0hpc3RvcnlJdGVtUHJpdmF0ZShXS0JhY2tGb3J3 YXJkTGlzdEl0ZW1SZWYgbGlzdEl0ZW0pCisgICAgOiBtX2JhY2tGb3J3YXJkTGlzdEl0ZW0obGlz dEl0ZW0pCit7Cit9CisKK1FXS0hpc3RvcnlJdGVtOjpRV0tIaXN0b3J5SXRlbSgpCit7Cit9CisK K1FXS0hpc3RvcnlJdGVtOjp+UVdLSGlzdG9yeUl0ZW0oKQoreworfQorCitRU3RyaW5nIFFXS0hp c3RvcnlJdGVtOjp0aXRsZSgpIGNvbnN0Cit7CisgICAgaWYgKCFkLT5tX2JhY2tGb3J3YXJkTGlz dEl0ZW0pCisgICAgICAgIHJldHVybiBRU3RyaW5nKCk7CisgICAgV0tSZXRhaW5QdHI8V0tTdHJp bmdSZWY+IHRpdGxlID0gV0tCYWNrRm9yd2FyZExpc3RJdGVtQ29weVRpdGxlKGQtPm1fYmFja0Zv cndhcmRMaXN0SXRlbS5nZXQoKSk7CisgICAgcmV0dXJuIFdLU3RyaW5nQ29weVFTdHJpbmcodGl0 bGUuZ2V0KCkpOworfQorCitRVXJsIFFXS0hpc3RvcnlJdGVtOjp1cmwoKSBjb25zdAoreworICAg IGlmICghZC0+bV9iYWNrRm9yd2FyZExpc3RJdGVtKQorICAgICAgICByZXR1cm4gUVVybCgpOwor ICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB1cmwgPSBXS0JhY2tGb3J3YXJkTGlzdEl0ZW1Db3B5 VVJMKGQtPm1fYmFja0ZvcndhcmRMaXN0SXRlbS5nZXQoKSk7CisgICAgcmV0dXJuIFdLVVJMQ29w eVFVcmwodXJsLmdldCgpKTsKK30KKworUVVybCBRV0tIaXN0b3J5SXRlbTo6b3JpZ2luYWxVcmwo KSBjb25zdAoreworICAgIGlmICghZC0+bV9iYWNrRm9yd2FyZExpc3RJdGVtKQorICAgICAgICBy ZXR1cm4gUVVybCgpOworICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB1cmwgPSBXS0JhY2tGb3J3 YXJkTGlzdEl0ZW1Db3B5T3JpZ2luYWxVUkwoZC0+bV9iYWNrRm9yd2FyZExpc3RJdGVtLmdldCgp KTsKKyAgICByZXR1cm4gV0tVUkxDb3B5UVVybCh1cmwuZ2V0KCkpOworfQorCiBRV0tIaXN0b3J5 UHJpdmF0ZTo6UVdLSGlzdG9yeVByaXZhdGUoV2ViS2l0OjpXZWJCYWNrRm9yd2FyZExpc3QqIGxp c3QpCiAgICAgOiBtX2JhY2tGb3J3YXJkTGlzdChsaXN0KQogewpJbmRleDogV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3F3a2hpc3RvcnkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vz cy9BUEkvcXQvcXdraGlzdG9yeS5oCShyZXZpc2lvbiA3MTAxMykKKysrIFdlYktpdDIvVUlQcm9j ZXNzL0FQSS9xdC9xd2toaXN0b3J5LmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDExICsyOSwzMCBA QAogI2luY2x1ZGUgPFFPYmplY3Q+CiAKIGNsYXNzIFFXS0hpc3RvcnlQcml2YXRlOworY2xhc3Mg UVdLSGlzdG9yeUl0ZW1Qcml2YXRlOworY2xhc3MgUVVybDsKK2NsYXNzIFFTdHJpbmc7CiAKIG5h bWVzcGFjZSBXZWJLaXQgewogY2xhc3MgV2ViQmFja0ZvcndhcmRMaXN0OwogfQogCitjbGFzcyBR V0VCS0lUX0VYUE9SVCBRV0tIaXN0b3J5SXRlbSB7CitwdWJsaWM6CisgICAgflFXS0hpc3RvcnlJ dGVtKCk7CisgICAgUVN0cmluZyB0aXRsZSgpIGNvbnN0OworICAgIFFVcmwgdXJsKCkgY29uc3Q7 CisgICAgUVVybCBvcmlnaW5hbFVybCgpIGNvbnN0OworCitwcml2YXRlOgorICAgIFFXS0hpc3Rv cnlJdGVtKCk7CisKKyAgICBRV0tIaXN0b3J5SXRlbVByaXZhdGUqIGQ7CisKKyAgICBmcmllbmQg Y2xhc3MgUVdLSGlzdG9yeTsKKyAgICBmcmllbmQgY2xhc3MgUVdLSGlzdG9yeUl0ZW1Qcml2YXRl OworfTsKKwogY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdLSGlzdG9yeSA6IHB1YmxpYyBRT2JqZWN0 IHsKICAgICBRX09CSkVDVAogcHVibGljOgpJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0 L3F3a2hpc3RvcnlfcC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9x d2toaXN0b3J5X3AuaAkocmV2aXNpb24gNzEwMTMpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXdraGlzdG9yeV9wLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDkgQEAKICNkZWZp bmUgcXdraGlzdG9yeV9wX2gKIAogI2luY2x1ZGUgInF3ZWJraXRnbG9iYWwuaCIKKyNpbmNsdWRl IDxXZWJLaXQyL1dLQmFzZS5oPgorI2luY2x1ZGUgPFdlYktpdDIvV0tSZXRhaW5QdHIuaD4KKyNp bmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIFdl YkJhY2tGb3J3YXJkTGlzdDsKQEAgLTMzLDYgKzM2LDE2IEBAIGNsYXNzIFdlYkJhY2tGb3J3YXJk TGlzdDsKIAogY2xhc3MgUVdLSGlzdG9yeTsKIAorY2xhc3MgUVdFQktJVF9FWFBPUlQgUVdLSGlz dG9yeUl0ZW1Qcml2YXRlIHsKK3ByaXZhdGU6CisgICAgUVdLSGlzdG9yeUl0ZW1Qcml2YXRlKFdL QmFja0ZvcndhcmRMaXN0SXRlbVJlZiBsaXN0SXRlbSk7CisKKyAgICBXS1JldGFpblB0cjxXS0Jh Y2tGb3J3YXJkTGlzdEl0ZW1SZWY+IG1fYmFja0ZvcndhcmRMaXN0SXRlbTsKKworICAgIGZyaWVu ZCBjbGFzcyBRV0tIaXN0b3J5OworICAgIGZyaWVuZCBjbGFzcyBRV0tIaXN0b3J5SXRlbTsKK307 CisKIGNsYXNzIFFXRUJLSVRfRVhQT1JUIFFXS0hpc3RvcnlQcml2YXRlIHsKIHB1YmxpYzoKICAg ICBzdGF0aWMgUVdLSGlzdG9yeSogY3JlYXRlSGlzdG9yeShXZWJLaXQ6OldlYkJhY2tGb3J3YXJk TGlzdCogbGlzdCk7Cg==