39010 2010-05-12 11:45:09 -0700 [Qt] QtField::name() returns a dangling pointer 2010-05-15 20:03:56 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 agbakken agbakken commit-queue kenneth oldest_to_newest 224770 0 agbakken 2010-05-12 11:45:09 -0700 QObject::objectName() returns a QString and the QtField::name() creates a temporary QByteArray object and returns constData() from it. This is not safe. The attached fix changes the signature to be a QByteArray instead of const char* and makes it non-virtual (since it never should have been). It's not a Bindings::Field function but rather an implementation detail in QtField and it's never reimplemented. The patch also includes a minor optimization to use const & in a foreach loop which is faster. 224772 1 55879 agbakken 2010-05-12 11:48:32 -0700 Created attachment 55879 Patch that fixes the problem 225263 2 jesus 2010-05-13 07:07:31 -0700 (In reply to comment #1) > Created an attachment (id=55879) [details] > Patch that fixes the problem Did you forget to mark it for review?! :) Quick tips for your next bug reports: - please add the 'Qt' Keyword; - if the bug is Qt specific add a '[Qt]' to the Summary; Thanks! 225302 3 55879 kenneth 2010-05-13 07:55:58 -0700 Comment on attachment 55879 Patch that fixes the problem > Index: WebCore/ChangeLog > =================================================================== > --- WebCore/ChangeLog (revision 59246) > +++ WebCore/ChangeLog (working copy) > @@ -1,3 +1,19 @@ > +2010-05-12 Anders Bakken <agbakken@gmail.com> > + > + QObject::objectName() returns a QString and QtField::name() > + creates a temporary QByteArray object and returns constData() from it. > + This is not safe. > + > + This patch changes the signature of the function to return a > + QByteArray instead of const char *. > + > + https://bugs.webkit.org/show_bug.cgi?id=39010 > + > + * bridge/qt/qt_instance.cpp: > + (JSC::Bindings::QtInstance::getPropertyNames): > + (JSC::Bindings::QtField::name): > + * bridge/qt/qt_runtime.h: > + Please fix the indentation WebCore/bridge/qt/qt_instance.cpp:234 + for (i=0; i < methodCount; i++) { i = 0, please fix the spacing Apart from this is look fine. 225317 4 55985 agbakken 2010-05-13 08:30:19 -0700 Created attachment 55985 Patch that fixes the problem 225344 5 kenneth 2010-05-13 09:33:19 -0700 Don't forget to add the r? and cq? flags 226259 6 55985 commit-queue 2010-05-15 08:51:06 -0700 Comment on attachment 55985 Patch that fixes the problem Rejecting patch 55985 from commit-queue. Unexpected failure when landing patch! Please file a bug against webkit-patch. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=webkit-commit-queue.appspot.com', 'land-attachment', '--force-clean', '--build', '--non-interactive', '--ignore-builders', '--build-style=both', '--quiet', 55985, '--test', '--parent-command=commit-queue', '--no-update']" exit_code: 1 Logging in as eseidel@chromium.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=55985&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=39010&ctype=xml Processing 1 patch from 1 bug. Cleaning working directory Processing patch 55985 from bug 39010. ERROR: /Users/eseidel/Projects/CommitQueue/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). 226302 7 kenneth 2010-05-15 12:31:51 -0700 Anders, you cannot remove the "Reviewed by NOBODY (OOPS!!)". If you do that we cannot land using the commit-queue. It has to be exactly like the prepare-ChangeLog scripts writes it. Now you can reupload the patch with this fixed and reset r? and cq? -- or -- You can upload the patch with "Reviewed by Kenneth Rohde Christiansen" and just set cq? The latter is preferred as anyone with committer-rights can change the cq? to cq+ Another option would be to get someone to land it manually using webkit-patch or similar. 226367 8 56167 abarth 2010-05-15 17:56:40 -0700 Created attachment 56167 Patch for landing 226397 9 56167 commit-queue 2010-05-15 20:03:50 -0700 Comment on attachment 56167 Patch for landing Clearing flags on attachment: 56167 Committed r59564: <http://trac.webkit.org/changeset/59564> 226398 10 commit-queue 2010-05-15 20:03:56 -0700 All reviewed patches have been landed. Closing bug. 55879 2010-05-12 11:48:32 -0700 2010-05-13 08:30:19 -0700 Patch that fixes the problem diff text/plain 3076 agbakken SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTI0NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDUtMTIgIEFuZGVycyBCYWtrZW4gIDxhZ2Jha2tlbkBnbWFp bC5jb20+CisKKyAgICAgICAgUU9iamVjdDo6b2JqZWN0TmFtZSgpIHJldHVybnMgYSBRU3RyaW5n IGFuZCBRdEZpZWxkOjpuYW1lKCkKKwljcmVhdGVzIGEgdGVtcG9yYXJ5IFFCeXRlQXJyYXkgb2Jq ZWN0IGFuZCByZXR1cm5zIGNvbnN0RGF0YSgpIGZyb20gaXQuCisJVGhpcyBpcyBub3Qgc2FmZS4K KworCVRoaXMgcGF0Y2ggY2hhbmdlcyB0aGUgc2lnbmF0dXJlIG9mIHRoZSBmdW5jdGlvbiB0byBy ZXR1cm4gYQorCVFCeXRlQXJyYXkgaW5zdGVhZCBvZiBjb25zdCBjaGFyICouCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MDEwCisKKyAgICAgICAg KiBicmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJ bnN0YW5jZTo6Z2V0UHJvcGVydHlOYW1lcyk6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpRdEZp ZWxkOjpuYW1lKToKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfcnVudGltZS5oOgorCiAyMDEwLTA1 LTEyICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGF2ZSBIeWF0dC4KSW5kZXg6IFdlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAJKHJldmlz aW9uIDU5MjQyKQorKysgV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMjUsMTIgKzIyNSwxMyBAQCB2b2lkIFF0SW5zdGFuY2U6OmdldFByb3BlcnR5 TmFtZXMoRXhlY1N0CiAKICNpZm5kZWYgUVRfTk9fUFJPUEVSVElFUwogICAgICAgICBRTGlzdDxR Qnl0ZUFycmF5PiBkeW5Qcm9wcyA9IG9iai0+ZHluYW1pY1Byb3BlcnR5TmFtZXMoKTsKLSAgICAg ICAgZm9yZWFjaChRQnl0ZUFycmF5IGJhLCBkeW5Qcm9wcykgeworICAgICAgICBmb3JlYWNoKGNv bnN0IFFCeXRlQXJyYXkmIGJhLCBkeW5Qcm9wcykgewogICAgICAgICAgICAgYXJyYXkuYWRkKElk ZW50aWZpZXIoZXhlYywgYmEuY29uc3REYXRhKCkpKTsKICAgICAgICAgfQogI2VuZGlmCiAKLSAg ICAgICAgZm9yIChpPTA7IGkgPCBtZXRhLT5tZXRob2RDb3VudCgpOyBpKyspIHsKKyAgICAgICAg Y29uc3QgaW50IG1ldGhvZENvdW50ID0gbWV0YS0+bWV0aG9kQ291bnQoKTsKKyAgICAgICAgZm9y IChpPTA7IGkgPCBtZXRob2RDb3VudDsgaSsrKSB7CiAgICAgICAgICAgICBRTWV0YU1ldGhvZCBt ZXRob2QgPSBtZXRhLT5tZXRob2QoaSk7CiAgICAgICAgICAgICBpZiAobWV0aG9kLmFjY2Vzcygp ICE9IFFNZXRhTWV0aG9kOjpQcml2YXRlKSB7CiAgICAgICAgICAgICAgICAgYXJyYXkuYWRkKElk ZW50aWZpZXIoZXhlYywgbWV0aG9kLnNpZ25hdHVyZSgpKSk7CkBAIC0zMjksNyArMzMwLDcgQEAg SlNWYWx1ZSBRdEluc3RhbmNlOjp2YWx1ZU9mKEV4ZWNTdGF0ZSogZQogSlNWYWx1ZSBjb252ZXJ0 UVZhcmlhbnRUb1ZhbHVlKEV4ZWNTdGF0ZSosIFBhc3NSZWZQdHI8Um9vdE9iamVjdD4gcm9vdCwg Y29uc3QgUVZhcmlhbnQmIHZhcmlhbnQpOwogUVZhcmlhbnQgY29udmVydFZhbHVlVG9RVmFyaWFu dChFeGVjU3RhdGUqLCBKU1ZhbHVlLCBRTWV0YVR5cGU6OlR5cGUgaGludCwgaW50ICpkaXN0YW5j ZSk7CiAKLWNvbnN0IGNoYXIqIFF0RmllbGQ6Om5hbWUoKSBjb25zdAorUUJ5dGVBcnJheSBRdEZp ZWxkOjpuYW1lKCkgY29uc3QKIHsKICAgICBpZiAobV90eXBlID09IE1ldGFQcm9wZXJ0eSkKICAg ICAgICAgcmV0dXJuIG1fcHJvcGVydHkubmFtZSgpOwpAQCAtMzM3LDkgKzMzOCw5IEBAIGNvbnN0 IGNoYXIqIFF0RmllbGQ6Om5hbWUoKSBjb25zdAogICAgICAgICByZXR1cm4gbV9jaGlsZE9iamVj dC0+b2JqZWN0TmFtZSgpLnRvTGF0aW4xKCk7CiAjaWZuZGVmIFFUX05PX1BST1BFUlRJRVMKICAg ICBlbHNlIGlmIChtX3R5cGUgPT0gRHluYW1pY1Byb3BlcnR5KQotICAgICAgICByZXR1cm4gbV9k eW5hbWljUHJvcGVydHkuY29uc3REYXRhKCk7CisgICAgICAgIHJldHVybiBtX2R5bmFtaWNQcm9w ZXJ0eTsKICNlbmRpZgotICAgIHJldHVybiAiIjsgLy8gZGVsZXRlZCBjaGlsZCBvYmplY3QKKyAg ICByZXR1cm4gUUJ5dGVBcnJheSgpOyAvLyBkZWxldGVkIGNoaWxkIG9iamVjdAogfQogCiBKU1Zh bHVlIFF0RmllbGQ6OnZhbHVlRnJvbUluc3RhbmNlKEV4ZWNTdGF0ZSogZXhlYywgY29uc3QgSW5z dGFuY2UqIGluc3QpIGNvbnN0CkluZGV4OiBXZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5oCShyZXZpc2lvbiA1 OTI0MikKKysrIFdlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuaAkod29ya2luZyBjb3B5KQpA QCAtNjIsNyArNjIsNyBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIEpTVmFsdWUgdmFsdWVGcm9t SW5zdGFuY2UoRXhlY1N0YXRlKiwgY29uc3QgSW5zdGFuY2UqKSBjb25zdDsKICAgICB2aXJ0dWFs IHZvaWQgc2V0VmFsdWVUb0luc3RhbmNlKEV4ZWNTdGF0ZSosIGNvbnN0IEluc3RhbmNlKiwgSlNW YWx1ZSkgY29uc3Q7Ci0gICAgdmlydHVhbCBjb25zdCBjaGFyKiBuYW1lKCkgY29uc3Q7CisgICAg UUJ5dGVBcnJheSBuYW1lKCkgY29uc3Q7CiAgICAgUXRGaWVsZFR5cGUgZmllbGRUeXBlKCkgY29u c3Qge3JldHVybiBtX3R5cGU7fQogcHJpdmF0ZToKICAgICBRdEZpZWxkVHlwZSBtX3R5cGU7Cg== 55985 2010-05-13 08:30:19 -0700 2010-05-15 17:56:35 -0700 Patch that fixes the problem diff text/plain 3142 agbakken SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n ICAgICAgICAocmV2aXNpb24gNTkyNDYpCisrKyBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNS0xMiAgQW5kZXJzIEJha2tlbiAg PGFnYmFra2VuQGdtYWlsLmNvbT4KKworICAgICAgICBRT2JqZWN0OjpvYmplY3ROYW1lKCkgcmV0 dXJucyBhIFFTdHJpbmcgYW5kIFF0RmllbGQ6Om5hbWUoKQorICAgICAgICBjcmVhdGVzIGEgdGVt cG9yYXJ5IFFCeXRlQXJyYXkgb2JqZWN0IGFuZCByZXR1cm5zIGNvbnN0RGF0YSgpIGZyb20gaXQu CisgICAgICAgIFRoaXMgaXMgbm90IHNhZmUuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjaGFuZ2Vz IHRoZSBzaWduYXR1cmUgb2YgdGhlIGZ1bmN0aW9uIHRvIHJldHVybiBhCisgICAgICAgIFFCeXRl QXJyYXkgaW5zdGVhZCBvZiBjb25zdCBjaGFyICouCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MDEwCisKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRf aW5zdGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6Z2V0UHJv cGVydHlOYW1lcyk6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpRdEZpZWxkOjpuYW1lKToKKyAg ICAgICAgKiBicmlkZ2UvcXQvcXRfcnVudGltZS5oOgorCiAyMDEwLTA1LTEyICBFbnJpY2EgQ2Fz dWNjaSAgPGVucmljYUBhcHBsZS5jb20+CgogICAgICAgICBSZXZpZXdlZCBieSBEYXZlIEh5YXR0 LgpJbmRleDogV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcCAgICAgICAgKHJldmlzaW9uIDU5MjQy KQorKysgV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwICAgICAgICAod29ya2luZyBj b3B5KQpAQCAtMjI1LDEyICsyMjUsMTMgQEAgdm9pZCBRdEluc3RhbmNlOjpnZXRQcm9wZXJ0eU5h bWVzKEV4ZWNTdAoKICNpZm5kZWYgUVRfTk9fUFJPUEVSVElFUwogICAgICAgICBRTGlzdDxRQnl0 ZUFycmF5PiBkeW5Qcm9wcyA9IG9iai0+ZHluYW1pY1Byb3BlcnR5TmFtZXMoKTsKLSAgICAgICAg Zm9yZWFjaChRQnl0ZUFycmF5IGJhLCBkeW5Qcm9wcykgeworICAgICAgICBmb3JlYWNoKGNvbnN0 IFFCeXRlQXJyYXkmIGJhLCBkeW5Qcm9wcykgewogICAgICAgICAgICAgYXJyYXkuYWRkKElkZW50 aWZpZXIoZXhlYywgYmEuY29uc3REYXRhKCkpKTsKICAgICAgICAgfQogI2VuZGlmCgotICAgICAg ICBmb3IgKGk9MDsgaSA8IG1ldGEtPm1ldGhvZENvdW50KCk7IGkrKykgeworICAgICAgICBjb25z dCBpbnQgbWV0aG9kQ291bnQgPSBtZXRhLT5tZXRob2RDb3VudCgpOworICAgICAgICBmb3IgKGkg PSAwOyBpIDwgbWV0aG9kQ291bnQ7IGkrKykgewogICAgICAgICAgICAgUU1ldGFNZXRob2QgbWV0 aG9kID0gbWV0YS0+bWV0aG9kKGkpOwogICAgICAgICAgICAgaWYgKG1ldGhvZC5hY2Nlc3MoKSAh PSBRTWV0YU1ldGhvZDo6UHJpdmF0ZSkgewogICAgICAgICAgICAgICAgIGFycmF5LmFkZChJZGVu dGlmaWVyKGV4ZWMsIG1ldGhvZC5zaWduYXR1cmUoKSkpOwpAQCAtMzI5LDcgKzMzMCw3IEBAIEpT VmFsdWUgUXRJbnN0YW5jZTo6dmFsdWVPZihFeGVjU3RhdGUqIGUKIEpTVmFsdWUgY29udmVydFFW YXJpYW50VG9WYWx1ZShFeGVjU3RhdGUqLCBQYXNzUmVmUHRyPFJvb3RPYmplY3Q+IHJvb3QsIGNv bnN0IFFWYXJpYW50JiB2YXJpYW50KTsKIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQo RXhlY1N0YXRlKiwgSlNWYWx1ZSwgUU1ldGFUeXBlOjpUeXBlIGhpbnQsIGludCAqZGlzdGFuY2Up OwoKLWNvbnN0IGNoYXIqIFF0RmllbGQ6Om5hbWUoKSBjb25zdAorUUJ5dGVBcnJheSBRdEZpZWxk OjpuYW1lKCkgY29uc3QKIHsKICAgICBpZiAobV90eXBlID09IE1ldGFQcm9wZXJ0eSkKICAgICAg ICAgcmV0dXJuIG1fcHJvcGVydHkubmFtZSgpOwpAQCAtMzM3LDkgKzMzOCw5IEBAIGNvbnN0IGNo YXIqIFF0RmllbGQ6Om5hbWUoKSBjb25zdAogICAgICAgICByZXR1cm4gbV9jaGlsZE9iamVjdC0+ b2JqZWN0TmFtZSgpLnRvTGF0aW4xKCk7CiAjaWZuZGVmIFFUX05PX1BST1BFUlRJRVMKICAgICBl bHNlIGlmIChtX3R5cGUgPT0gRHluYW1pY1Byb3BlcnR5KQotICAgICAgICByZXR1cm4gbV9keW5h bWljUHJvcGVydHkuY29uc3REYXRhKCk7CisgICAgICAgIHJldHVybiBtX2R5bmFtaWNQcm9wZXJ0 eTsKICNlbmRpZgotICAgIHJldHVybiAiIjsgLy8gZGVsZXRlZCBjaGlsZCBvYmplY3QKKyAgICBy ZXR1cm4gUUJ5dGVBcnJheSgpOyAvLyBkZWxldGVkIGNoaWxkIG9iamVjdAogfQoKIEpTVmFsdWUg UXRGaWVsZDo6dmFsdWVGcm9tSW5zdGFuY2UoRXhlY1N0YXRlKiBleGVjLCBjb25zdCBJbnN0YW5j ZSogaW5zdCkgY29uc3QKSW5kZXg6IFdlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1lLmggICAgICAgIChyZXZpc2lv biA1OTI0MikKKysrIFdlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuaCAgICAgICAgKHdvcmtp bmcgY29weSkKQEAgLTYyLDcgKzYyLDcgQEAgcHVibGljOgoKICAgICB2aXJ0dWFsIEpTVmFsdWUg dmFsdWVGcm9tSW5zdGFuY2UoRXhlY1N0YXRlKiwgY29uc3QgSW5zdGFuY2UqKSBjb25zdDsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0VmFsdWVUb0luc3RhbmNlKEV4ZWNTdGF0ZSosIGNvbnN0IEluc3Rh bmNlKiwgSlNWYWx1ZSkgY29uc3Q7Ci0gICAgdmlydHVhbCBjb25zdCBjaGFyKiBuYW1lKCkgY29u c3Q7CisgICAgUUJ5dGVBcnJheSBuYW1lKCkgY29uc3Q7CiAgICAgUXRGaWVsZFR5cGUgZmllbGRU eXBlKCkgY29uc3Qge3JldHVybiBtX3R5cGU7fQogcHJpdmF0ZToKICAgICBRdEZpZWxkVHlwZSBt X3R5cGU7Cg== 56167 2010-05-15 17:56:40 -0700 2010-05-15 20:03:50 -0700 Patch for landing bug-39010-20100515175639.patch text/plain 3308 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjUwYzA3YTk3MzU3MWI3MTAxNTljYWM5MDI4MDBhZGUwY2MyZDgyYy4uMTYxYTE0ZTI3Mzg0MDg2 MDczZWJhODgxZGY3ZTQ4OTIyMWVlNTE4YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNS0xNSAgQW5k ZXJzIEJha2tlbiAgPGFnYmFra2VuQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBL ZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAgICBRT2JqZWN0OjpvYmplY3ROYW1l KCkgcmV0dXJucyBhIFFTdHJpbmcgYW5kIFF0RmllbGQ6Om5hbWUoKQorICAgICAgICBjcmVhdGVz IGEgdGVtcG9yYXJ5IFFCeXRlQXJyYXkgb2JqZWN0IGFuZCByZXR1cm5zIGNvbnN0RGF0YSgpIGZy b20gaXQuCisgICAgICAgIFRoaXMgaXMgbm90IHNhZmUuCisKKyAgICAgICAgVGhpcyBwYXRjaCBj aGFuZ2VzIHRoZSBzaWduYXR1cmUgb2YgdGhlIGZ1bmN0aW9uIHRvIHJldHVybiBhCisgICAgICAg IFFCeXRlQXJyYXkgaW5zdGVhZCBvZiBjb25zdCBjaGFyICouCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MDEwCisKKyAgICAgICAgKiBicmlkZ2Uv cXQvcXRfaW5zdGFuY2UuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6 Z2V0UHJvcGVydHlOYW1lcyk6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpRdEZpZWxkOjpuYW1l KToKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfcnVudGltZS5oOgorCiAyMDEwLTA1LTE1ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAgYi9X ZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKaW5kZXggZDQwYWIwYjcxNjI4OGNkOGRk NmViYzA0NTE3MzY3NmQwNzg4ZjZhMC4uOTdiYjM0Yjc3Yzk2ZTk0NTVmZDczZWI2OGU0MWI3OGE3 OTY5MmZmOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCisr KyBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcApAQCAtMjI1LDEyICsyMjUsMTMg QEAgdm9pZCBRdEluc3RhbmNlOjpnZXRQcm9wZXJ0eU5hbWVzKEV4ZWNTdGF0ZSogZXhlYywgUHJv cGVydHlOYW1lQXJyYXkmIGFycmF5KQogCiAjaWZuZGVmIFFUX05PX1BST1BFUlRJRVMKICAgICAg ICAgUUxpc3Q8UUJ5dGVBcnJheT4gZHluUHJvcHMgPSBvYmotPmR5bmFtaWNQcm9wZXJ0eU5hbWVz KCk7Ci0gICAgICAgIGZvcmVhY2goUUJ5dGVBcnJheSBiYSwgZHluUHJvcHMpIHsKKyAgICAgICAg Zm9yZWFjaChjb25zdCBRQnl0ZUFycmF5JiBiYSwgZHluUHJvcHMpIHsKICAgICAgICAgICAgIGFy cmF5LmFkZChJZGVudGlmaWVyKGV4ZWMsIGJhLmNvbnN0RGF0YSgpKSk7CiAgICAgICAgIH0KICNl bmRpZgogCi0gICAgICAgIGZvciAoaT0wOyBpIDwgbWV0YS0+bWV0aG9kQ291bnQoKTsgaSsrKSB7 CisgICAgICAgIGNvbnN0IGludCBtZXRob2RDb3VudCA9IG1ldGEtPm1ldGhvZENvdW50KCk7Cisg ICAgICAgIGZvciAoaSA9IDA7IGkgPCBtZXRob2RDb3VudDsgaSsrKSB7CiAgICAgICAgICAgICBR TWV0YU1ldGhvZCBtZXRob2QgPSBtZXRhLT5tZXRob2QoaSk7CiAgICAgICAgICAgICBpZiAobWV0 aG9kLmFjY2VzcygpICE9IFFNZXRhTWV0aG9kOjpQcml2YXRlKSB7CiAgICAgICAgICAgICAgICAg YXJyYXkuYWRkKElkZW50aWZpZXIoZXhlYywgbWV0aG9kLnNpZ25hdHVyZSgpKSk7CkBAIC0zMjks NyArMzMwLDcgQEAgSlNWYWx1ZSBRdEluc3RhbmNlOjp2YWx1ZU9mKEV4ZWNTdGF0ZSogZXhlYykg Y29uc3QKIEpTVmFsdWUgY29udmVydFFWYXJpYW50VG9WYWx1ZShFeGVjU3RhdGUqLCBQYXNzUmVm UHRyPFJvb3RPYmplY3Q+IHJvb3QsIGNvbnN0IFFWYXJpYW50JiB2YXJpYW50KTsKIFFWYXJpYW50 IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiwgSlNWYWx1ZSwgUU1ldGFUeXBlOjpU eXBlIGhpbnQsIGludCAqZGlzdGFuY2UpOwogCi1jb25zdCBjaGFyKiBRdEZpZWxkOjpuYW1lKCkg Y29uc3QKK1FCeXRlQXJyYXkgUXRGaWVsZDo6bmFtZSgpIGNvbnN0CiB7CiAgICAgaWYgKG1fdHlw ZSA9PSBNZXRhUHJvcGVydHkpCiAgICAgICAgIHJldHVybiBtX3Byb3BlcnR5Lm5hbWUoKTsKQEAg LTMzNyw5ICszMzgsOSBAQCBjb25zdCBjaGFyKiBRdEZpZWxkOjpuYW1lKCkgY29uc3QKICAgICAg ICAgcmV0dXJuIG1fY2hpbGRPYmplY3QtPm9iamVjdE5hbWUoKS50b0xhdGluMSgpOwogI2lmbmRl ZiBRVF9OT19QUk9QRVJUSUVTCiAgICAgZWxzZSBpZiAobV90eXBlID09IER5bmFtaWNQcm9wZXJ0 eSkKLSAgICAgICAgcmV0dXJuIG1fZHluYW1pY1Byb3BlcnR5LmNvbnN0RGF0YSgpOworICAgICAg ICByZXR1cm4gbV9keW5hbWljUHJvcGVydHk7CiAjZW5kaWYKLSAgICByZXR1cm4gIiI7IC8vIGRl bGV0ZWQgY2hpbGQgb2JqZWN0CisgICAgcmV0dXJuIFFCeXRlQXJyYXkoKTsgLy8gZGVsZXRlZCBj aGlsZCBvYmplY3QKIH0KIAogSlNWYWx1ZSBRdEZpZWxkOjp2YWx1ZUZyb21JbnN0YW5jZShFeGVj U3RhdGUqIGV4ZWMsIGNvbnN0IEluc3RhbmNlKiBpbnN0KSBjb25zdApkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9icmlkZ2UvcXQvcXRfcnVudGltZS5oIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRfcnVudGlt ZS5oCmluZGV4IDA5NTFlNWI1MmNmODY2NTUwYTFkMmQ5NzQxN2EzZGVlZjUyMDk0ZjcuLjU3Mzlj YjRlZDJlNWFlMjRmNWQ0YmM1MGM2NjJhZmE3OGYyZDMxZDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv YnJpZGdlL3F0L3F0X3J1bnRpbWUuaAorKysgYi9XZWJDb3JlL2JyaWRnZS9xdC9xdF9ydW50aW1l LmgKQEAgLTYyLDcgKzYyLDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBKU1ZhbHVlIHZhbHVl RnJvbUluc3RhbmNlKEV4ZWNTdGF0ZSosIGNvbnN0IEluc3RhbmNlKikgY29uc3Q7CiAgICAgdmly dHVhbCB2b2lkIHNldFZhbHVlVG9JbnN0YW5jZShFeGVjU3RhdGUqLCBjb25zdCBJbnN0YW5jZSos IEpTVmFsdWUpIGNvbnN0OwotICAgIHZpcnR1YWwgY29uc3QgY2hhciogbmFtZSgpIGNvbnN0Owor ICAgIFFCeXRlQXJyYXkgbmFtZSgpIGNvbnN0OwogICAgIFF0RmllbGRUeXBlIGZpZWxkVHlwZSgp IGNvbnN0IHtyZXR1cm4gbV90eXBlO30KIHByaXZhdGU6CiAgICAgUXRGaWVsZFR5cGUgbV90eXBl Owo=