29185 2009-09-11 08:45:43 -0700 [Qt] QWebGraphicsItem should check for null QWebPage 2009-09-14 10:26:57 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 jwieczorek webkit-unassigned commit-queue kenneth tonikitoo oldest_to_newest 146573 0 jwieczorek 2009-09-11 08:45:43 -0700 QWebGraphicsItem segfaults when the associated page is null. 146574 1 39436 jwieczorek 2009-09-11 08:48:56 -0700 Created attachment 39436 patch to fix the segfaults 146590 2 tonikitoo 2009-09-11 09:08:34 -0700 jakub, looks good overall ... just one question: in comment https://bugs.webkit.org/show_bug.cgi?id=28862#c14 simon suggested to not use page() (maybe to avoid a unnecessary method call overhead), but d->page ... maybe we should respect that ? ps: although i agree w/ your idea since page() willalways return a non-null pointer 146601 3 jwieczorek 2009-09-11 09:28:50 -0700 (In reply to comment #2) > jakub, looks good overall ... just one question: in comment > https://bugs.webkit.org/show_bug.cgi?id=28862#c14 simon suggested to not use > page() (maybe to avoid a unnecessary method call overhead), but d->page ... > maybe we should respect that ? > > ps: although i agree w/ your idea since page() willalways return a non-null > pointer I agree with the comment as far as it concerns functions that should silently return when the page is null. But most of them should just create a default page when they are called. That's also how QWebView works and I believe that QWebGraphicsItem should be symmetrical to that. Otherwise, you would never be able to load an url because the page would always be null. 146621 4 39446 jwieczorek 2009-09-11 10:14:25 -0700 Created attachment 39446 patch to fix the segfaults This one fixes one more crash. 146699 5 kenneth 2009-09-11 12:02:15 -0700 but then again I guess setGeometry etc should also create a page, so that I can do ->setGeometry(...) ->load(...) and it will actually respect the geometry. > I agree with the comment as far as it concerns functions that should silently > return when the page is null. But most of them should just create a default > page when they are called. That's also how QWebView works and I believe that > QWebGraphicsItem should be symmetrical to that. Otherwise, you would never be > able to load an url because the page would always be null. 146705 6 jwieczorek 2009-09-11 12:14:17 -0700 (In reply to comment #5) > but then again I guess setGeometry etc should also create a page, so that I can > do > > ->setGeometry(...) > ->load(...) > > and it will actually respect the geometry. It does. QWebGraphicsItem::setPage(), that would be triggered by the load() call, sets the viewport size. 146707 7 kenneth 2009-09-11 12:27:09 -0700 ah great! maybe add a unit test for this? 146899 8 39446 hausmann 2009-09-11 23:16:16 -0700 Comment on attachment 39446 patch to fix the segfaults r=me. Thanks Jakub! 146901 9 39446 commit-queue 2009-09-11 23:29:50 -0700 Comment on attachment 39446 patch to fix the segfaults Rejecting patch 39446 from commit-queue. This patch will require manual commit. ['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1'] failed with exit code 1 147073 10 39446 eric 2009-09-14 09:51:15 -0700 Comment on attachment 39446 patch to fix the segfaults media/video-source-error.html -> timed out You were bitten by bug 28845. 147086 11 39446 commit-queue 2009-09-14 10:08:02 -0700 Comment on attachment 39446 patch to fix the segfaults Rejecting patch 39446 from commit-queue. This patch will require manual commit. ['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1'] failed with exit code 1 147089 12 39446 eric 2009-09-14 10:12:04 -0700 Comment on attachment 39446 patch to fix the segfaults svg/custom/group-opacity.svg -> failed It would appear we have a flakey SVG test. 147098 13 39446 commit-queue 2009-09-14 10:26:53 -0700 Comment on attachment 39446 patch to fix the segfaults Clearing flags on attachment: 39446 Committed r48357: <http://trac.webkit.org/changeset/48357> 147099 14 commit-queue 2009-09-14 10:26:57 -0700 All reviewed patches have been landed. Closing bug. 39436 2009-09-11 08:48:56 -0700 2009-09-11 10:14:25 -0700 patch to fix the segfaults 0001-Qt-Don-t-crash-in-QWebGraphicsItem-when-the-page-is-.patch text/plain 4532 jwieczorek RnJvbSBjMmVlOWUxMjMyNWI0MmUwYTQ0MzM0Njg1MDBmYjI1ODk1OGU2NjhkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWt1YiBXaWVjem9yZWsgPGZhdzIxN0BnbWFpbC5jb20+CkRh dGU6IEZyaSwgMTEgU2VwIDIwMDkgMTk6MzE6MjMgKzAyMDAKU3ViamVjdDogW1BBVENIXSBbUXRd IERvbid0IGNyYXNoIGluIFFXZWJHcmFwaGljc0l0ZW0gd2hlbiB0aGUgcGFnZSBpcyBzdGlsbCBu dWxsLCBieQogZWl0aGVyIGNoZWNraW5nIGlmIGl0J3MgdGhlIGNhc2Ugb3IgY29uc3RydWN0aW5n IHRoZSBkZWZhdWx0IG9uZS4KCi0tLQogV2ViS2l0L3F0L0FwaS9xd2ViZ3JhcGhpY3NpdGVtLmNw cCB8ICAgMzEgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogV2ViS2l0L3F0L0NoYW5n ZUxvZyAgICAgICAgICAgICAgICB8ICAgMjIgKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxl cyBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9XZWJLaXQvcXQvQXBpL3F3ZWJncmFwaGljc2l0ZW0uY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2Vi Z3JhcGhpY3NpdGVtLmNwcAppbmRleCA2NGUwYTI2Li5lYjJjOWZlIDEwMDY0NAotLS0gYS9XZWJL aXQvcXQvQXBpL3F3ZWJncmFwaGljc2l0ZW0uY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYmdy YXBoaWNzaXRlbS5jcHAKQEAgLTI4Miw3ICsyODIsMTAgQEAgUVN0cmluZyBRV2ViR3JhcGhpY3NJ dGVtOjp0aXRsZSgpIGNvbnN0CiAqLwogUUljb24gUVdlYkdyYXBoaWNzSXRlbTo6aWNvbigpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIGQtPnBhZ2UtPm1haW5GcmFtZSgpLT5pY29uKCk7CisgICAgaWYg KGQtPnBhZ2UpCisgICAgICAgIHJldHVybiBkLT5wYWdlLT5tYWluRnJhbWUoKS0+aWNvbigpOwor CisgICAgcmV0dXJuIFFJY29uKCk7CiB9CiAKIC8qIQpAQCAtMjkzLDE3ICsyOTYsMTMgQEAgUUlj b24gUVdlYkdyYXBoaWNzSXRlbTo6aWNvbigpIGNvbnN0CiAKIHZvaWQgUVdlYkdyYXBoaWNzSXRl bTo6c2V0Wm9vbUZhY3RvcihxcmVhbCBmYWN0b3IpCiB7Ci0gICAgaWYgKGZhY3RvciA9PSBkLT5w YWdlLT5tYWluRnJhbWUoKS0+em9vbUZhY3RvcigpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBk LT5wYWdlLT5tYWluRnJhbWUoKS0+c2V0Wm9vbUZhY3RvcihmYWN0b3IpOwotCisgICAgcGFnZSgp LT5tYWluRnJhbWUoKS0+c2V0Wm9vbUZhY3RvcihmYWN0b3IpOwogICAgIGVtaXQgem9vbUZhY3Rv ckNoYW5nZWQoKTsKIH0KIAogcXJlYWwgUVdlYkdyYXBoaWNzSXRlbTo6em9vbUZhY3RvcigpIGNv bnN0CiB7Ci0gICAgcmV0dXJuIGQtPnBhZ2UtPm1haW5GcmFtZSgpLT56b29tRmFjdG9yKCk7Cisg ICAgcmV0dXJuIHBhZ2UoKS0+bWFpbkZyYW1lKCktPnpvb21GYWN0b3IoKTsKIH0KIAogLyohIFxy ZWltcApAQCAtMzIwLDYgKzMxOSwxMCBAQCB2b2lkIFFXZWJHcmFwaGljc0l0ZW06OnVwZGF0ZUdl b21ldHJ5KCkKIHZvaWQgUVdlYkdyYXBoaWNzSXRlbTo6c2V0R2VvbWV0cnkoY29uc3QgUVJlY3RG JiByZWN0KQogewogICAgIFFHcmFwaGljc1dpZGdldDo6c2V0R2VvbWV0cnkocmVjdCk7CisKKyAg ICBpZiAoIWQtPnBhZ2UpCisgICAgICAgIHJldHVybjsKKwogICAgIC8vIE5PVEU6IGNhbGwgZ2Vv bWV0cnkoKSBhcyBzZXRHZW9tZXRyeSBlbnN1cmVzIHRoYXQKICAgICAvLyB0aGUgZ2VvbWV0cnkg aXMgd2l0aGluIGxlZ2FsIGJvdW5kcyAobWluaW11bVNpemUsIG1heGltdW1TaXplKQogICAgIFFT aXplIHNpemUgPSBnZW9tZXRyeSgpLnNpemUoKS50b1NpemUoKTsKQEAgLTQwNCw3ICs0MDcsNyBA QCBxcmVhbCBRV2ViR3JhcGhpY3NJdGVtOjpwcm9ncmVzcygpIGNvbnN0CiAqLwogdm9pZCBRV2Vi R3JhcGhpY3NJdGVtOjpsb2FkKGNvbnN0IFFVcmwmIHVybCkKIHsKLSAgICBkLT5wYWdlLT5tYWlu RnJhbWUoKS0+bG9hZCh1cmwpOworICAgIHBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWQodXJsKTsK IH0KIAogLyohCkBAIC00MjMsNyArNDI2LDcgQEAgdm9pZCBRV2ViR3JhcGhpY3NJdGVtOjpsb2Fk KGNvbnN0IFFOZXR3b3JrUmVxdWVzdCYgcmVxdWVzdCwKICAgICAgICAgICAgICAgICAgICAgUU5l dHdvcmtBY2Nlc3NNYW5hZ2VyOjpPcGVyYXRpb24gb3BlcmF0aW9uLAogICAgICAgICAgICAgICAg ICAgICBjb25zdCBRQnl0ZUFycmF5JiBib2R5KQogewotICAgIGQtPnBhZ2UtPm1haW5GcmFtZSgp LT5sb2FkKHJlcXVlc3QsIG9wZXJhdGlvbiwgYm9keSk7CisgICAgcGFnZSgpLT5tYWluRnJhbWUo KS0+bG9hZChyZXF1ZXN0LCBvcGVyYXRpb24sIGJvZHkpOwogfQogCiAvKiEKQEAgLTQ0NCwxMiAr NDQ3LDEyIEBAIHZvaWQgUVdlYkdyYXBoaWNzSXRlbTo6bG9hZChjb25zdCBRTmV0d29ya1JlcXVl c3QmIHJlcXVlc3QsCiAqLwogdm9pZCBRV2ViR3JhcGhpY3NJdGVtOjpzZXRIdG1sKGNvbnN0IFFT dHJpbmcmIGh0bWwsIGNvbnN0IFFVcmwmIGJhc2VVcmwpCiB7Ci0gICAgZC0+cGFnZS0+bWFpbkZy YW1lKCktPnNldEh0bWwoaHRtbCwgYmFzZVVybCk7CisgICAgcGFnZSgpLT5tYWluRnJhbWUoKS0+ c2V0SHRtbChodG1sLCBiYXNlVXJsKTsKIH0KIAogUVN0cmluZyBRV2ViR3JhcGhpY3NJdGVtOjp0 b0h0bWwoKSBjb25zdAogewotICAgIHJldHVybiBkLT5wYWdlLT5tYWluRnJhbWUoKS0+dG9IdG1s KCk7CisgICAgcmV0dXJuIHBhZ2UoKS0+bWFpbkZyYW1lKCktPnRvSHRtbCgpOwogfQogCiAvKiEK QEAgLTQ2NSw3ICs0NjgsNyBAQCBRU3RyaW5nIFFXZWJHcmFwaGljc0l0ZW06OnRvSHRtbCgpIGNv bnN0CiAqLwogdm9pZCBRV2ViR3JhcGhpY3NJdGVtOjpzZXRDb250ZW50KGNvbnN0IFFCeXRlQXJy YXkmIGRhdGEsIGNvbnN0IFFTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBRVXJsJiBiYXNlVXJsKQog ewotICAgIGQtPnBhZ2UtPm1haW5GcmFtZSgpLT5zZXRDb250ZW50KGRhdGEsIG1pbWVUeXBlLCBi YXNlVXJsKTsKKyAgICBwYWdlKCktPm1haW5GcmFtZSgpLT5zZXRDb250ZW50KGRhdGEsIG1pbWVU eXBlLCBiYXNlVXJsKTsKIH0KIAogLyohCkBAIC00NzcsNyArNDgwLDcgQEAgdm9pZCBRV2ViR3Jh cGhpY3NJdGVtOjpzZXRDb250ZW50KGNvbnN0IFFCeXRlQXJyYXkmIGRhdGEsIGNvbnN0IFFTdHJp bmcmIG1pbWVUeXAKICovCiBRV2ViSGlzdG9yeSogUVdlYkdyYXBoaWNzSXRlbTo6aGlzdG9yeSgp IGNvbnN0CiB7Ci0gICAgcmV0dXJuIGQtPnBhZ2UtPmhpc3RvcnkoKTsKKyAgICByZXR1cm4gcGFn ZSgpLT5oaXN0b3J5KCk7CiB9CiAKIC8qIQpAQCAtNTEwLDcgKzUxMyw3IEBAIHZvaWQgUVdlYkdy YXBoaWNzSXRlbTo6c2V0SW50ZXJhY3RpdmUoYm9vbCBhbGxvd2VkKQogKi8KIFFXZWJTZXR0aW5n cyogUVdlYkdyYXBoaWNzSXRlbTo6c2V0dGluZ3MoKSBjb25zdAogewotICAgIHJldHVybiBkLT5w YWdlLT5zZXR0aW5ncygpOworICAgIHJldHVybiBwYWdlKCktPnNldHRpbmdzKCk7CiB9CiAKIC8q ISBccmVpbXAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hh bmdlTG9nCmluZGV4IGY4NjRiY2MuLjFmOGIyNTQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDA5LTA5 LTExICBKYWt1YiBXaWVjem9yZWsgIDxmYXcyMTdAZ21haWwuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUVdlYkdyYXBoaWNzSXRlbSBz aG91bGQgY2hlY2sgZm9yIG51bGwgUVdlYlBhZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE4NQorCisgICAgICAgIERvbid0IGNyYXNoIGluIFFX ZWJHcmFwaGljc0l0ZW0gd2hlbiB0aGUgcGFnZSBpcyBzdGlsbCBudWxsLCBieQorICAgICAgICBl aXRoZXIgY2hlY2tpbmcgaWYgaXQncyB0aGUgY2FzZSBvciBjb25zdHJ1Y3RpbmcgdGhlIGRlZmF1 bHQgb25lLgorCisgICAgICAgICogQXBpL3F3ZWJncmFwaGljc2l0ZW0uY3BwOgorICAgICAgICAo UVdlYkdyYXBoaWNzSXRlbTo6aWNvbik6CisgICAgICAgIChRV2ViR3JhcGhpY3NJdGVtOjpzZXRa b29tRmFjdG9yKToKKyAgICAgICAgKFFXZWJHcmFwaGljc0l0ZW06Onpvb21GYWN0b3IpOgorICAg ICAgICAoUVdlYkdyYXBoaWNzSXRlbTo6c2V0R2VvbWV0cnkpOgorICAgICAgICAoUVdlYkdyYXBo aWNzSXRlbTo6bG9hZCk6CisgICAgICAgIChRV2ViR3JhcGhpY3NJdGVtOjpzZXRIdG1sKToKKyAg ICAgICAgKFFXZWJHcmFwaGljc0l0ZW06OnRvSHRtbCk6CisgICAgICAgIChRV2ViR3JhcGhpY3NJ dGVtOjpzZXRDb250ZW50KToKKyAgICAgICAgKFFXZWJHcmFwaGljc0l0ZW06Omhpc3RvcnkpOgor ICAgICAgICAoUVdlYkdyYXBoaWNzSXRlbTo6c2V0dGluZ3MpOgorCiAyMDA5LTA5LTExICBEYXZp ZCBCb2RkaWUgIDxkYm9kZGllQHRyb2xsdGVjaC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg U2ltb24gSGF1c21hbm4uCi0tIAoxLjYuNC4xCgo= 39446 2009-09-11 10:14:25 -0700 2009-09-14 10:26:53 -0700 patch to fix the segfaults 0001--Qt-QWebGraphicsItem-should-check-for-null-QWebPage.patch text/plain 6219 jwieczorek RnJvbSBlYjU2OGMzOTY1MjYzOGY1NjQ4NmM0NjdhMjQ4YTVkMWI1M2QxZjEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYWt1YiBXaWVjem9yZWsgPGZhdzIxN0BnbWFpbC5jb20+CkRh dGU6IEZyaSwgMTEgU2VwIDIwMDkgMjE6MTE6MTMgKzAyMDAKU3ViamVjdDogW1BBVENIXSBbUXRd IFFXZWJHcmFwaGljc0l0ZW0gc2hvdWxkIGNoZWNrIGZvciBudWxsIFFXZWJQYWdlLgogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5MTg1CgpSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KCkRvbid0IGNyYXNoIGluIFFXZWJHcmFwaGljc0l0ZW0gd2hlbiB0aGUgcGFn ZSBpcyBzdGlsbCBudWxsLCBieQplaXRoZXIgY2hlY2tpbmcgaWYgaXQncyB0aGUgY2FzZSBvciBj b25zdHJ1Y3RpbmcgdGhlIGRlZmF1bHQgb25lLgoKKiBBcGkvcXdlYmdyYXBoaWNzaXRlbS5jcHA6 CihRV2ViR3JhcGhpY3NJdGVtOjppY29uKToKKFFXZWJHcmFwaGljc0l0ZW06OnNldFpvb21GYWN0 b3IpOgooUVdlYkdyYXBoaWNzSXRlbTo6em9vbUZhY3Rvcik6CihRV2ViR3JhcGhpY3NJdGVtOjpz ZXRHZW9tZXRyeSk6CihRV2ViR3JhcGhpY3NJdGVtOjpsb2FkKToKKFFXZWJHcmFwaGljc0l0ZW06 OnNldEh0bWwpOgooUVdlYkdyYXBoaWNzSXRlbTo6dG9IdG1sKToKKFFXZWJHcmFwaGljc0l0ZW06 OnNldENvbnRlbnQpOgooUVdlYkdyYXBoaWNzSXRlbTo6aGlzdG9yeSk6CihRV2ViR3JhcGhpY3NJ dGVtOjpzZXR0aW5ncyk6Ci0tLQogV2ViS2l0L3F0L0FwaS9xd2ViZ3JhcGhpY3NpdGVtLmNwcCB8 ICAgNDMgKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCiBXZWJLaXQvcXQvQ2hh bmdlTG9nICAgICAgICAgICAgICAgIHwgICAyMiArKysrKysrKysrKysrKysrKysKIDIgZmlsZXMg Y2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv V2ViS2l0L3F0L0FwaS9xd2ViZ3JhcGhpY3NpdGVtLmNwcCBiL1dlYktpdC9xdC9BcGkvcXdlYmdy YXBoaWNzaXRlbS5jcHAKaW5kZXggNjRlMGEyNi4uYzhjYjI5NCAxMDA2NDQKLS0tIGEvV2ViS2l0 L3F0L0FwaS9xd2ViZ3JhcGhpY3NpdGVtLmNwcAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJncmFw aGljc2l0ZW0uY3BwCkBAIC04Nyw3ICs4Nyw3IEBAIHZvaWQgUVdlYkdyYXBoaWNzSXRlbVByaXZh dGU6Ol9xX2RvVXBkYXRlKGNvbnN0IFFSZWN0ICYgZGlydHlSZWN0KQogdm9pZCBRV2ViR3JhcGhp Y3NJdGVtUHJpdmF0ZTo6X3Ffc2V0U3RhdHVzQmFyTWVzc2FnZShjb25zdCBRU3RyaW5nJiBzKQog ewogICAgIHN0YXR1c0Jhck1lc3NhZ2UgPSBzOwotICAgIHEtPmVtaXQgc3RhdHVzQ2hhbmdlZCgp OworICAgIGVtaXQgcS0+c3RhdHVzQ2hhbmdlZCgpOwogfQogCiAvKiEKQEAgLTE2MCw3ICsxNjAs NyBAQCBRV2ViUGFnZSogUVdlYkdyYXBoaWNzSXRlbTo6cGFnZSgpIGNvbnN0CiAqLwogdm9pZCBR V2ViR3JhcGhpY3NJdGVtOjpwYWludChRUGFpbnRlciogcGFpbnRlciwgY29uc3QgUVN0eWxlT3B0 aW9uR3JhcGhpY3NJdGVtKiBvcHRpb24sIFFXaWRnZXQqKQogewotICAgIGQtPnBhZ2UtPm1haW5G cmFtZSgpLT5yZW5kZXIocGFpbnRlciwgb3B0aW9uLT5leHBvc2VkUmVjdC50b1JlY3QoKSk7Cisg ICAgcGFnZSgpLT5tYWluRnJhbWUoKS0+cmVuZGVyKHBhaW50ZXIsIG9wdGlvbi0+ZXhwb3NlZFJl Y3QudG9SZWN0KCkpOwogfQogCiAvKiEgXHJlaW1wCkBAIC0yNDIsMTAgKzI0Miw3IEBAIHZvaWQg UVdlYkdyYXBoaWNzSXRlbTo6c2V0UGFnZShRV2ViUGFnZSogcGFnZSkKIAogdm9pZCBRV2ViR3Jh cGhpY3NJdGVtOjpzZXRVcmwoY29uc3QgUVVybCAmdXJsKQogewotICAgIGlmICghZC0+cGFnZSB8 fCBkLT5wYWdlLT5tYWluRnJhbWUoKS0+dXJsKCkgPT0gdXJsKQotICAgICAgICByZXR1cm47Ci0K LSAgICBkLT5wYWdlLT5tYWluRnJhbWUoKS0+c2V0VXJsKHVybCk7CisgICAgcGFnZSgpLT5tYWlu RnJhbWUoKS0+c2V0VXJsKHVybCk7CiB9CiAKIFFVcmwgUVdlYkdyYXBoaWNzSXRlbTo6dXJsKCkg Y29uc3QKQEAgLTI4Miw3ICsyNzksMTAgQEAgUVN0cmluZyBRV2ViR3JhcGhpY3NJdGVtOjp0aXRs ZSgpIGNvbnN0CiAqLwogUUljb24gUVdlYkdyYXBoaWNzSXRlbTo6aWNvbigpIGNvbnN0CiB7Ci0g ICAgcmV0dXJuIGQtPnBhZ2UtPm1haW5GcmFtZSgpLT5pY29uKCk7CisgICAgaWYgKGQtPnBhZ2Up CisgICAgICAgIHJldHVybiBkLT5wYWdlLT5tYWluRnJhbWUoKS0+aWNvbigpOworCisgICAgcmV0 dXJuIFFJY29uKCk7CiB9CiAKIC8qIQpAQCAtMjkzLDE3ICsyOTMsMTYgQEAgUUljb24gUVdlYkdy YXBoaWNzSXRlbTo6aWNvbigpIGNvbnN0CiAKIHZvaWQgUVdlYkdyYXBoaWNzSXRlbTo6c2V0Wm9v bUZhY3RvcihxcmVhbCBmYWN0b3IpCiB7Ci0gICAgaWYgKGZhY3RvciA9PSBkLT5wYWdlLT5tYWlu RnJhbWUoKS0+em9vbUZhY3RvcigpKQorICAgIGlmIChmYWN0b3IgPT0gcGFnZSgpLT5tYWluRnJh bWUoKS0+em9vbUZhY3RvcigpKQogICAgICAgICByZXR1cm47CiAKLSAgICBkLT5wYWdlLT5tYWlu RnJhbWUoKS0+c2V0Wm9vbUZhY3RvcihmYWN0b3IpOwotCisgICAgcGFnZSgpLT5tYWluRnJhbWUo KS0+c2V0Wm9vbUZhY3RvcihmYWN0b3IpOwogICAgIGVtaXQgem9vbUZhY3RvckNoYW5nZWQoKTsK IH0KIAogcXJlYWwgUVdlYkdyYXBoaWNzSXRlbTo6em9vbUZhY3RvcigpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIGQtPnBhZ2UtPm1haW5GcmFtZSgpLT56b29tRmFjdG9yKCk7CisgICAgcmV0dXJuIHBh Z2UoKS0+bWFpbkZyYW1lKCktPnpvb21GYWN0b3IoKTsKIH0KIAogLyohIFxyZWltcApAQCAtMzEx LDYgKzMxMCwxMCBAQCBxcmVhbCBRV2ViR3JhcGhpY3NJdGVtOjp6b29tRmFjdG9yKCkgY29uc3QK IHZvaWQgUVdlYkdyYXBoaWNzSXRlbTo6dXBkYXRlR2VvbWV0cnkoKQogewogICAgIFFHcmFwaGlj c1dpZGdldDo6dXBkYXRlR2VvbWV0cnkoKTsKKworICAgIGlmICghZC0+cGFnZSkKKyAgICAgICAg cmV0dXJuOworCiAgICAgUVNpemUgc2l6ZSA9IGdlb21ldHJ5KCkuc2l6ZSgpLnRvU2l6ZSgpOwog ICAgIGQtPnBhZ2UtPnNldFZpZXdwb3J0U2l6ZShzaXplKTsKIH0KQEAgLTMyMCw2ICszMjMsMTAg QEAgdm9pZCBRV2ViR3JhcGhpY3NJdGVtOjp1cGRhdGVHZW9tZXRyeSgpCiB2b2lkIFFXZWJHcmFw aGljc0l0ZW06OnNldEdlb21ldHJ5KGNvbnN0IFFSZWN0RiYgcmVjdCkKIHsKICAgICBRR3JhcGhp Y3NXaWRnZXQ6OnNldEdlb21ldHJ5KHJlY3QpOworCisgICAgaWYgKCFkLT5wYWdlKQorICAgICAg ICByZXR1cm47CisKICAgICAvLyBOT1RFOiBjYWxsIGdlb21ldHJ5KCkgYXMgc2V0R2VvbWV0cnkg ZW5zdXJlcyB0aGF0CiAgICAgLy8gdGhlIGdlb21ldHJ5IGlzIHdpdGhpbiBsZWdhbCBib3VuZHMg KG1pbmltdW1TaXplLCBtYXhpbXVtU2l6ZSkKICAgICBRU2l6ZSBzaXplID0gZ2VvbWV0cnkoKS5z aXplKCkudG9TaXplKCk7CkBAIC00MDQsNyArNDExLDcgQEAgcXJlYWwgUVdlYkdyYXBoaWNzSXRl bTo6cHJvZ3Jlc3MoKSBjb25zdAogKi8KIHZvaWQgUVdlYkdyYXBoaWNzSXRlbTo6bG9hZChjb25z dCBRVXJsJiB1cmwpCiB7Ci0gICAgZC0+cGFnZS0+bWFpbkZyYW1lKCktPmxvYWQodXJsKTsKKyAg ICBwYWdlKCktPm1haW5GcmFtZSgpLT5sb2FkKHVybCk7CiB9CiAKIC8qIQpAQCAtNDIzLDcgKzQz MCw3IEBAIHZvaWQgUVdlYkdyYXBoaWNzSXRlbTo6bG9hZChjb25zdCBRTmV0d29ya1JlcXVlc3Qm IHJlcXVlc3QsCiAgICAgICAgICAgICAgICAgICAgIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6T3Bl cmF0aW9uIG9wZXJhdGlvbiwKICAgICAgICAgICAgICAgICAgICAgY29uc3QgUUJ5dGVBcnJheSYg Ym9keSkKIHsKLSAgICBkLT5wYWdlLT5tYWluRnJhbWUoKS0+bG9hZChyZXF1ZXN0LCBvcGVyYXRp b24sIGJvZHkpOworICAgIHBhZ2UoKS0+bWFpbkZyYW1lKCktPmxvYWQocmVxdWVzdCwgb3BlcmF0 aW9uLCBib2R5KTsKIH0KIAogLyohCkBAIC00NDQsMTIgKzQ1MSwxMiBAQCB2b2lkIFFXZWJHcmFw aGljc0l0ZW06OmxvYWQoY29uc3QgUU5ldHdvcmtSZXF1ZXN0JiByZXF1ZXN0LAogKi8KIHZvaWQg UVdlYkdyYXBoaWNzSXRlbTo6c2V0SHRtbChjb25zdCBRU3RyaW5nJiBodG1sLCBjb25zdCBRVXJs JiBiYXNlVXJsKQogewotICAgIGQtPnBhZ2UtPm1haW5GcmFtZSgpLT5zZXRIdG1sKGh0bWwsIGJh c2VVcmwpOworICAgIHBhZ2UoKS0+bWFpbkZyYW1lKCktPnNldEh0bWwoaHRtbCwgYmFzZVVybCk7 CiB9CiAKIFFTdHJpbmcgUVdlYkdyYXBoaWNzSXRlbTo6dG9IdG1sKCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gZC0+cGFnZS0+bWFpbkZyYW1lKCktPnRvSHRtbCgpOworICAgIHJldHVybiBwYWdlKCkt Pm1haW5GcmFtZSgpLT50b0h0bWwoKTsKIH0KIAogLyohCkBAIC00NjUsNyArNDcyLDcgQEAgUVN0 cmluZyBRV2ViR3JhcGhpY3NJdGVtOjp0b0h0bWwoKSBjb25zdAogKi8KIHZvaWQgUVdlYkdyYXBo aWNzSXRlbTo6c2V0Q29udGVudChjb25zdCBRQnl0ZUFycmF5JiBkYXRhLCBjb25zdCBRU3RyaW5n JiBtaW1lVHlwZSwgY29uc3QgUVVybCYgYmFzZVVybCkKIHsKLSAgICBkLT5wYWdlLT5tYWluRnJh bWUoKS0+c2V0Q29udGVudChkYXRhLCBtaW1lVHlwZSwgYmFzZVVybCk7CisgICAgcGFnZSgpLT5t YWluRnJhbWUoKS0+c2V0Q29udGVudChkYXRhLCBtaW1lVHlwZSwgYmFzZVVybCk7CiB9CiAKIC8q IQpAQCAtNDc3LDcgKzQ4NCw3IEBAIHZvaWQgUVdlYkdyYXBoaWNzSXRlbTo6c2V0Q29udGVudChj b25zdCBRQnl0ZUFycmF5JiBkYXRhLCBjb25zdCBRU3RyaW5nJiBtaW1lVHlwCiAqLwogUVdlYkhp c3RvcnkqIFFXZWJHcmFwaGljc0l0ZW06Omhpc3RvcnkoKSBjb25zdAogewotICAgIHJldHVybiBk LT5wYWdlLT5oaXN0b3J5KCk7CisgICAgcmV0dXJuIHBhZ2UoKS0+aGlzdG9yeSgpOwogfQogCiAv KiEKQEAgLTUxMCw3ICs1MTcsNyBAQCB2b2lkIFFXZWJHcmFwaGljc0l0ZW06OnNldEludGVyYWN0 aXZlKGJvb2wgYWxsb3dlZCkKICovCiBRV2ViU2V0dGluZ3MqIFFXZWJHcmFwaGljc0l0ZW06OnNl dHRpbmdzKCkgY29uc3QKIHsKLSAgICByZXR1cm4gZC0+cGFnZS0+c2V0dGluZ3MoKTsKKyAgICBy ZXR1cm4gcGFnZSgpLT5zZXR0aW5ncygpOwogfQogCiAvKiEgXHJlaW1wCmRpZmYgLS1naXQgYS9X ZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCBmODY0YmNjLi4x ZjhiMjU0IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAwOS0wOS0xMSAgSmFrdWIgV2llY3pvcmVrICA8 ZmF3MjE3QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbUXRdIFFXZWJHcmFwaGljc0l0ZW0gc2hvdWxkIGNoZWNrIGZvciBudWxsIFFX ZWJQYWdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjkxODUKKworICAgICAgICBEb24ndCBjcmFzaCBpbiBRV2ViR3JhcGhpY3NJdGVtIHdoZW4gdGhl IHBhZ2UgaXMgc3RpbGwgbnVsbCwgYnkKKyAgICAgICAgZWl0aGVyIGNoZWNraW5nIGlmIGl0J3Mg dGhlIGNhc2Ugb3IgY29uc3RydWN0aW5nIHRoZSBkZWZhdWx0IG9uZS4KKworICAgICAgICAqIEFw aS9xd2ViZ3JhcGhpY3NpdGVtLmNwcDoKKyAgICAgICAgKFFXZWJHcmFwaGljc0l0ZW06Omljb24p OgorICAgICAgICAoUVdlYkdyYXBoaWNzSXRlbTo6c2V0Wm9vbUZhY3Rvcik6CisgICAgICAgIChR V2ViR3JhcGhpY3NJdGVtOjp6b29tRmFjdG9yKToKKyAgICAgICAgKFFXZWJHcmFwaGljc0l0ZW06 OnNldEdlb21ldHJ5KToKKyAgICAgICAgKFFXZWJHcmFwaGljc0l0ZW06OmxvYWQpOgorICAgICAg ICAoUVdlYkdyYXBoaWNzSXRlbTo6c2V0SHRtbCk6CisgICAgICAgIChRV2ViR3JhcGhpY3NJdGVt Ojp0b0h0bWwpOgorICAgICAgICAoUVdlYkdyYXBoaWNzSXRlbTo6c2V0Q29udGVudCk6CisgICAg ICAgIChRV2ViR3JhcGhpY3NJdGVtOjpoaXN0b3J5KToKKyAgICAgICAgKFFXZWJHcmFwaGljc0l0 ZW06OnNldHRpbmdzKToKKwogMjAwOS0wOS0xMSAgRGF2aWQgQm9kZGllICA8ZGJvZGRpZUB0cm9s bHRlY2guY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5uLgotLSAKMS42 LjAuMgoK