39009 2010-05-12 11:42:02 -0700 [Qt] QtClass uses non-threadsafe APIs 2010-05-15 20:47:13 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 agbakken agbakken abarth commit-queue eric kenneth webkit.review.bot oldest_to_newest 224765 0 agbakken 2010-05-12 11:42:02 -0700 Identifier::ascii() is not threadsafe and shouldn't be used for converting to and from QString/QByteArray. Also included are some minor optimizations that makes it use const & instead of copying const QList<QObject*>& QObject::children() 224769 1 55878 agbakken 2010-05-12 11:44:14 -0700 Created attachment 55878 A patch that fixes the issues 225261 2 jesus 2010-05-13 07:04:20 -0700 (In reply to comment #1) > Created an attachment (id=55878) [details] > A patch that fixes the issues Did you forget to mark it for review?! :) I'm doing the bug triaging this week, so just some quick tips for you when opening your next bug reports: - please add the 'Qt' Keyword; - if the bug is Qt specific add a '[Qt]' to the Summary; Thanks! 225289 3 agbakken 2010-05-13 07:42:37 -0700 Hi Jesus I did mean to mark it for review. Thanks. I'll try to remember that. I've been slightly confused about what to put in those combobboxes. 225292 4 kenneth 2010-05-13 07:44:33 -0700 put r? (== I request review) and cq? (== I request automatically commit after reviewed positively using the commut-queue) 225295 5 55878 kenneth 2010-05-13 07:48:19 -0700 Comment on attachment 55878 A patch that fixes the issues In the future please add the title of the bug as well. 225318 6 agbakken 2010-05-13 08:31:52 -0700 (In reply to comment #5) > (From update of attachment 55878 [details]) > In the future please add the title of the bug as well. Uh. Where do I put the title? 225348 7 kenneth 2010-05-13 09:40:40 -0700 In the changelog you add title of the bug <- here http://webkit.org/b/bugid description... 226088 8 55878 commit-queue 2010-05-14 18:32:11 -0700 Comment on attachment 55878 A patch that fixes the issues Rejecting patch 55878 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', 55878, '--test', '--parent-command=commit-queue', '--no-update']" exit_code: 1 Logging in as eseidel@chromium.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=55878&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=39009&ctype=xml Processing 1 patch from 1 bug. Cleaning working directory Processing patch 55878 from bug 39009. ERROR: /Users/eseidel/Projects/CommitQueue/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). 226304 9 kenneth 2010-05-15 12:33:03 -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. 226364 10 56166 abarth 2010-05-15 17:53:32 -0700 Created attachment 56166 Patch for landing 226365 11 abarth 2010-05-15 17:53:53 -0700 Also, we don't allow tabs in ChangeLogs. 226391 12 56166 commit-queue 2010-05-15 19:34:18 -0700 Comment on attachment 56166 Patch for landing Clearing flags on attachment: 56166 Committed r59562: <http://trac.webkit.org/changeset/59562> 226392 13 commit-queue 2010-05-15 19:34:24 -0700 All reviewed patches have been landed. Closing bug. 226407 14 webkit.review.bot 2010-05-15 20:47:13 -0700 http://trac.webkit.org/changeset/59562 might have broken GTK Linux 64-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/59561 http://trac.webkit.org/changeset/59562 55878 2010-05-12 11:44:14 -0700 2010-05-15 17:53:26 -0700 A patch that fixes the issues diff text/plain 6516 agbakken SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1OTI0NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMDUtMTIgIEFuZGVycyBCYWtrZW4gIDxhZ2Jha2tlbkBnbWFp bC5jb20+CisKKwlJZGVudGlmaWVyOjphc2NpaSgpIGlzIG5vdCB0aHJlYWRzYWZlIGFuZCBzaG91 bGRuJ3QgYmUgdXNlZCBmb3IKKwljb252ZXJ0aW5nIHRvIGFuZCBmcm9tIFFTdHJpbmcvUUJ5dGVB cnJheS4KKworCWh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zOTAwOQor CisgICAgICAgICogYnJpZGdlL3F0L3F0X2NsYXNzLmNwcDoKKyAgICAgICAgKEpTQzo6QmluZGlu Z3M6OlF0Q2xhc3M6OmZhbGxiYWNrT2JqZWN0KToKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6OlF0 Q2xhc3M6OmZpZWxkTmFtZWQpOgorCiAyMDEwLTA1LTEyICBFbnJpY2EgQ2FzdWNjaSAgPGVucmlj YUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2ZSBIeWF0dC4KSW5kZXg6IFdl YkNvcmUvYnJpZGdlL3F0L3F0X2NsYXNzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JyaWRn ZS9xdC9xdF9jbGFzcy5jcHAJKHJldmlzaW9uIDU5MjQyKQorKysgV2ViQ29yZS9icmlkZ2UvcXQv cXRfY2xhc3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MCw3ICs3MCw5IEBAIEpTVmFsdWUgUXRD bGFzczo6ZmFsbGJhY2tPYmplY3QoRXhlY1N0YXQKIHsKICAgICBRdEluc3RhbmNlKiBxdGluc3Qg PSBzdGF0aWNfY2FzdDxRdEluc3RhbmNlKj4oaW5zdCk7CiAKLSAgICBRQnl0ZUFycmF5IG5hbWUo aWRlbnRpZmllci5hc2NpaSgpKTsKKyAgICBjb25zdCBVU3RyaW5nJiB1c3RyaW5nID0gaWRlbnRp Zmllci51c3RyaW5nKCk7CisgICAgY29uc3QgUUJ5dGVBcnJheSBuYW1lID0gUVN0cmluZyhyZWlu dGVycHJldF9jYXN0PGNvbnN0IFFDaGFyKj4odXN0cmluZy5kYXRhKCkpLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdXN0cmluZy5zaXplKCkpLnRvQXNjaWkoKTsKIAogICAg IC8vIEZpcnN0IHNlZSBpZiB3ZSBoYXZlIGEgY2FjaGUgaGl0CiAgICAgSlNPYmplY3QqIHZhbCA9 IHF0aW5zdC0+bV9tZXRob2RzLnZhbHVlKG5hbWUpOwpAQCAtNzgsNyArODAsNyBAQCBKU1ZhbHVl IFF0Q2xhc3M6OmZhbGxiYWNrT2JqZWN0KEV4ZWNTdGF0CiAgICAgICAgIHJldHVybiB2YWw7CiAK ICAgICAvLyBOb3BlLCBjcmVhdGUgYW4gZW50cnkKLSAgICBRQnl0ZUFycmF5IG5vcm1hbCA9IFFN ZXRhT2JqZWN0Ojpub3JtYWxpemVkU2lnbmF0dXJlKG5hbWUuY29uc3REYXRhKCkpOworICAgIGNv bnN0IFFCeXRlQXJyYXkgbm9ybWFsID0gUU1ldGFPYmplY3Q6Om5vcm1hbGl6ZWRTaWduYXR1cmUo bmFtZS5jb25zdERhdGEoKSk7CiAKICAgICAvLyBTZWUgaWYgdGhlcmUgaXMgYW4gZXhhY3QgbWF0 Y2gKICAgICBpbnQgaW5kZXggPSAtMTsKQEAgLTkyLDcgKzk0LDcgQEAgSlNWYWx1ZSBRdENsYXNz OjpmYWxsYmFja09iamVjdChFeGVjU3RhdAogICAgIH0KIAogICAgIC8vIE5vcGUuLiB0cnkgYSBi YXNlbmFtZSBtYXRjaAotICAgIGludCBjb3VudCA9IG1fbWV0YU9iamVjdC0+bWV0aG9kQ291bnQo KTsKKyAgICBjb25zdCBpbnQgY291bnQgPSBtX21ldGFPYmplY3QtPm1ldGhvZENvdW50KCk7CiAg ICAgZm9yIChpbmRleCA9IGNvdW50IC0gMTsgaW5kZXggPj0gMDsgLS1pbmRleCkgewogICAgICAg ICBjb25zdCBRTWV0YU1ldGhvZCBtID0gbV9tZXRhT2JqZWN0LT5tZXRob2QoaW5kZXgpOwogICAg ICAgICBpZiAobS5hY2Nlc3MoKSA9PSBRTWV0YU1ldGhvZDo6UHJpdmF0ZSkKQEAgLTEyNiwxMiAr MTI4LDEyIEBAIEZpZWxkKiBRdENsYXNzOjpmaWVsZE5hbWVkKGNvbnN0IElkZW50aWYKICAgICBR dEluc3RhbmNlKiBxdGluc3QgPSBzdGF0aWNfY2FzdDxRdEluc3RhbmNlKj4oaW5zdGFuY2UpOwog CiAgICAgUU9iamVjdCogb2JqID0gcXRpbnN0LT5nZXRPYmplY3QoKTsKLSAgICBVU3RyaW5nIHVz dHJpbmcgPSBpZGVudGlmaWVyLnVzdHJpbmcoKTsKLSAgICBRU3RyaW5nIG9iak5hbWUoKGNvbnN0 IFFDaGFyKil1c3RyaW5nLnJlcCgpLT5jaGFyYWN0ZXJzKCksIHVzdHJpbmcuc2l6ZSgpKTsKLSAg ICBRQnl0ZUFycmF5IGJhID0gb2JqTmFtZS50b0FzY2lpKCk7CisgICAgY29uc3QgVVN0cmluZyYg dXN0cmluZyA9IGlkZW50aWZpZXIudXN0cmluZygpOworICAgIGNvbnN0IFFTdHJpbmcgbmFtZShy ZWludGVycHJldF9jYXN0PGNvbnN0IFFDaGFyKj4odXN0cmluZy5kYXRhKCkpLCB1c3RyaW5nLnNp emUoKSk7CisgICAgY29uc3QgUUJ5dGVBcnJheSBhc2NpaSA9IG5hbWUudG9Bc2NpaSgpOwogCiAg ICAgLy8gRmlyc3QgY2hlY2sgZm9yIGEgY2FjaGVkIGZpZWxkCi0gICAgUXRGaWVsZCogZiA9IHF0 aW5zdC0+bV9maWVsZHMudmFsdWUob2JqTmFtZSk7CisgICAgUXRGaWVsZCogZiA9IHF0aW5zdC0+ bV9maWVsZHMudmFsdWUobmFtZSk7CiAKICAgICBpZiAob2JqKSB7CiAgICAgICAgIGlmIChmKSB7 CkBAIC0xNDEsNTggKzE0Myw2MCBAQCBGaWVsZCogUXRDbGFzczo6ZmllbGROYW1lZChjb25zdCBJ ZGVudGlmCiAgICAgICAgICAgICAgICAgcmV0dXJuIGY7CiAjaWZuZGVmIFFUX05PX1BST1BFUlRJ RVMKICAgICAgICAgICAgIGVsc2UgaWYgKGYtPmZpZWxkVHlwZSgpID09IFF0RmllbGQ6OkR5bmFt aWNQcm9wZXJ0eSkgewotICAgICAgICAgICAgICAgIGlmIChvYmotPmR5bmFtaWNQcm9wZXJ0eU5h bWVzKCkuaW5kZXhPZihiYSkgPj0gMCkKKyAgICAgICAgICAgICAgICBpZiAob2JqLT5keW5hbWlj UHJvcGVydHlOYW1lcygpLmluZGV4T2YoYXNjaWkpID49IDApCiAgICAgICAgICAgICAgICAgICAg IHJldHVybiBmOwogICAgICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgICAgICAv LyBEeW5hbWljIHByb3BlcnR5IHRoYXQgZGlzYXBwZWFyZWQKLSAgICAgICAgICAgICAgICAgICAg cXRpbnN0LT5tX2ZpZWxkcy5yZW1vdmUob2JqTmFtZSk7CisgICAgICAgICAgICAgICAgICAgIHF0 aW5zdC0+bV9maWVsZHMucmVtb3ZlKG5hbWUpOwogICAgICAgICAgICAgICAgICAgICBkZWxldGUg ZjsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAjZW5kaWYKICAgICAgICAgICAg IGVsc2UgewotICAgICAgICAgICAgICAgIFFMaXN0PFFPYmplY3QqPiBjaGlsZHJlbiA9IG9iai0+ Y2hpbGRyZW4oKTsKLSAgICAgICAgICAgICAgICBmb3IgKGludCBpbmRleCA9IDA7IGluZGV4IDwg Y2hpbGRyZW4uY291bnQoKTsgKytpbmRleCkgeworICAgICAgICAgICAgICAgIGNvbnN0IFFMaXN0 PFFPYmplY3QqPiYgY2hpbGRyZW4gPSBvYmotPmNoaWxkcmVuKCk7CisgICAgICAgICAgICAgICAg Y29uc3QgaW50IGNvdW50ID0gY2hpbGRyZW4uc2l6ZSgpOworICAgICAgICAgICAgICAgIGZvciAo aW50IGluZGV4ID0gMDsgaW5kZXggPCBjb3VudDsgKytpbmRleCkgewogICAgICAgICAgICAgICAg ICAgICBRT2JqZWN0ICpjaGlsZCA9IGNoaWxkcmVuLmF0KGluZGV4KTsKLSAgICAgICAgICAgICAg ICAgICAgaWYgKGNoaWxkLT5vYmplY3ROYW1lKCkgPT0gb2JqTmFtZSkKKyAgICAgICAgICAgICAg ICAgICAgaWYgKGNoaWxkLT5vYmplY3ROYW1lKCkgPT0gbmFtZSkKICAgICAgICAgICAgICAgICAg ICAgICAgIHJldHVybiBmOwogICAgICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgICAgIC8v IERpZG4ndCBmaW5kIGl0LCBkZWxldGUgaXQgZnJvbSB0aGUgY2FjaGUKLSAgICAgICAgICAgICAg ICBxdGluc3QtPm1fZmllbGRzLnJlbW92ZShvYmpOYW1lKTsKKyAgICAgICAgICAgICAgICBxdGlu c3QtPm1fZmllbGRzLnJlbW92ZShuYW1lKTsKICAgICAgICAgICAgICAgICBkZWxldGUgZjsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIGludCBpbmRleCA9IG1fbWV0YU9iamVj dC0+aW5kZXhPZlByb3BlcnR5KGlkZW50aWZpZXIuYXNjaWkoKSk7CisgICAgICAgIGludCBpbmRl eCA9IG1fbWV0YU9iamVjdC0+aW5kZXhPZlByb3BlcnR5KGFzY2lpKTsKICAgICAgICAgaWYgKGlu ZGV4ID49IDApIHsKLSAgICAgICAgICAgIFFNZXRhUHJvcGVydHkgcHJvcCA9IG1fbWV0YU9iamVj dC0+cHJvcGVydHkoaW5kZXgpOworICAgICAgICAgICAgY29uc3QgUU1ldGFQcm9wZXJ0eSBwcm9w ID0gbV9tZXRhT2JqZWN0LT5wcm9wZXJ0eShpbmRleCk7CiAKICAgICAgICAgICAgIGlmIChwcm9w LmlzU2NyaXB0YWJsZShvYmopKSB7CiAgICAgICAgICAgICAgICAgZiA9IG5ldyBRdEZpZWxkKHBy b3ApOwotICAgICAgICAgICAgICAgIHF0aW5zdC0+bV9maWVsZHMuaW5zZXJ0KG9iak5hbWUsIGYp OworICAgICAgICAgICAgICAgIHF0aW5zdC0+bV9maWVsZHMuaW5zZXJ0KG5hbWUsIGYpOwogICAg ICAgICAgICAgICAgIHJldHVybiBmOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKICNpZm5k ZWYgUVRfTk9fUFJPUEVSVElFUwogICAgICAgICAvLyBEeW5hbWljIHByb3BlcnRpZXMKLSAgICAg ICAgaW5kZXggPSBvYmotPmR5bmFtaWNQcm9wZXJ0eU5hbWVzKCkuaW5kZXhPZihiYSk7CisgICAg ICAgIGluZGV4ID0gb2JqLT5keW5hbWljUHJvcGVydHlOYW1lcygpLmluZGV4T2YoYXNjaWkpOwog ICAgICAgICBpZiAoaW5kZXggPj0gMCkgewotICAgICAgICAgICAgZiA9IG5ldyBRdEZpZWxkKGJh KTsKLSAgICAgICAgICAgIHF0aW5zdC0+bV9maWVsZHMuaW5zZXJ0KG9iak5hbWUsIGYpOworICAg ICAgICAgICAgZiA9IG5ldyBRdEZpZWxkKGFzY2lpKTsKKyAgICAgICAgICAgIHF0aW5zdC0+bV9m aWVsZHMuaW5zZXJ0KG5hbWUsIGYpOwogICAgICAgICAgICAgcmV0dXJuIGY7CiAgICAgICAgIH0K ICNlbmRpZgogCiAgICAgICAgIC8vIENoaWxkIG9iamVjdHMKIAotICAgICAgICBRTGlzdDxRT2Jq ZWN0Kj4gY2hpbGRyZW4gPSBvYmotPmNoaWxkcmVuKCk7Ci0gICAgICAgIGZvciAoaW5kZXggPSAw OyBpbmRleCA8IGNoaWxkcmVuLmNvdW50KCk7ICsraW5kZXgpIHsKKyAgICAgICAgY29uc3QgUUxp c3Q8UU9iamVjdCo+JiBjaGlsZHJlbiA9IG9iai0+Y2hpbGRyZW4oKTsKKyAgICAgICAgY29uc3Qg aW50IGNvdW50ID0gY2hpbGRyZW4uY291bnQoKTsKKyAgICAgICAgZm9yIChpbmRleCA9IDA7IGlu ZGV4IDwgY291bnQ7ICsraW5kZXgpIHsKICAgICAgICAgICAgIFFPYmplY3QgKmNoaWxkID0gY2hp bGRyZW4uYXQoaW5kZXgpOwotICAgICAgICAgICAgaWYgKGNoaWxkLT5vYmplY3ROYW1lKCkgPT0g b2JqTmFtZSkgeworICAgICAgICAgICAgaWYgKGNoaWxkLT5vYmplY3ROYW1lKCkgPT0gbmFtZSkg ewogICAgICAgICAgICAgICAgIGYgPSBuZXcgUXRGaWVsZChjaGlsZCk7Ci0gICAgICAgICAgICAg ICAgcXRpbnN0LT5tX2ZpZWxkcy5pbnNlcnQob2JqTmFtZSwgZik7CisgICAgICAgICAgICAgICAg cXRpbnN0LT5tX2ZpZWxkcy5pbnNlcnQobmFtZSwgZik7CiAgICAgICAgICAgICAgICAgcmV0dXJu IGY7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTIwMCwxOSArMjA0LDE4IEBAIEZpZWxk KiBRdENsYXNzOjpmaWVsZE5hbWVkKGNvbnN0IElkZW50aWYKICAgICAgICAgLy8gTm90aGluZyBu YW1lZCB0aGlzCiAgICAgICAgIHJldHVybiAwOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIFFCeXRl QXJyYXkgYmEoaWRlbnRpZmllci5hc2NpaSgpKTsKICAgICAgICAgLy8gRm9yIGNvbXBhdGliaWxp dHkgd2l0aCBxdHNjcmlwdCwgY2FjaGVkIG1ldGhvZHMgZG9uJ3QgY2F1c2UKICAgICAgICAgLy8g ZXJyb3JzIHVudGlsIHRoZXkgYXJlIGFjY2Vzc2VkLCBzbyBkb24ndCBibGluZGx5IGNyZWF0ZSBh biBlcnJvcgogICAgICAgICAvLyBoZXJlLgotICAgICAgICBpZiAocXRpbnN0LT5tX21ldGhvZHMu Y29udGFpbnMoYmEpKQorICAgICAgICBpZiAocXRpbnN0LT5tX21ldGhvZHMuY29udGFpbnMoYXNj aWkpKQogICAgICAgICAgICAgcmV0dXJuIDA7CiAKICNpZm5kZWYgUVRfTk9fUFJPUEVSVElFUwog ICAgICAgICAvLyBkZWxldGVkIHFvYmplY3QsIGJ1dCBjYW4ndCB0aHJvdyBhbiBlcnJvciBmcm9t IGhlcmUgKG5vIGV4ZWMpCiAgICAgICAgIC8vIGNyZWF0ZSBhIGZha2UgUXRGaWVsZCB0aGF0IHdp bGwgdGhyb3cgdXBvbiBhY2Nlc3MKICAgICAgICAgaWYgKCFmKSB7Ci0gICAgICAgICAgICBmID0g bmV3IFF0RmllbGQoYmEpOwotICAgICAgICAgICAgcXRpbnN0LT5tX2ZpZWxkcy5pbnNlcnQob2Jq TmFtZSwgZik7CisgICAgICAgICAgICBmID0gbmV3IFF0RmllbGQoYXNjaWkpOworICAgICAgICAg ICAgcXRpbnN0LT5tX2ZpZWxkcy5pbnNlcnQobmFtZSwgZik7CiAgICAgICAgIH0KICNlbmRpZgog ICAgICAgICByZXR1cm4gZjsK 56166 2010-05-15 17:53:32 -0700 2010-05-15 19:34:18 -0700 Patch for landing bug-39009-20100515175330.patch text/plain 6891 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjUwYzA3YTk3MzU3MWI3MTAxNTljYWM5MDI4MDBhZGUwY2MyZDgyYy4uYzA2MTAxMmE0NjI0Yzgz ZGRmZmFkMzJkZTczMzc5OGJjY2VhNjlkMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wNS0xNSAgQW5k ZXJzIEJha2tlbiAgPGFnYmFra2VuQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBL ZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KKworICAgICAgICBJZGVudGlmaWVyOjphc2NpaSgp IGlzIG5vdCB0aHJlYWRzYWZlIGFuZCBzaG91bGRuJ3QgYmUgdXNlZCBmb3IKKyAgICAgICAgY29u dmVydGluZyB0byBhbmQgZnJvbSBRU3RyaW5nL1FCeXRlQXJyYXkuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MDA5CisKKyAgICAgICAgKiBicmlk Z2UvcXQvcXRfY2xhc3MuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRDbGFzczo6ZmFs bGJhY2tPYmplY3QpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRDbGFzczo6ZmllbGROYW1l ZCk6CisKIDIwMTAtMDUtMTUgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYnJpZGdl L3F0L3F0X2NsYXNzLmNwcCBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2NsYXNzLmNwcAppbmRleCBj ZmQ3NGQ5Mzg4NDJhNmY3NzM2OWMzYWRhOWI0ODdjNTkyZDAzMzc3Li4zNTUyYjU4NjgwOGYzN2Ex MmU4MDMwNDUyZjMzNGMwMDJlZTUwOTNiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JyaWRnZS9xdC9x dF9jbGFzcy5jcHAKKysrIGIvV2ViQ29yZS9icmlkZ2UvcXQvcXRfY2xhc3MuY3BwCkBAIC03MCw3 ICs3MCw5IEBAIEpTVmFsdWUgUXRDbGFzczo6ZmFsbGJhY2tPYmplY3QoRXhlY1N0YXRlKiBleGVj LCBJbnN0YW5jZSogaW5zdCwgY29uc3QgSWRlbnRpZmllCiB7CiAgICAgUXRJbnN0YW5jZSogcXRp bnN0ID0gc3RhdGljX2Nhc3Q8UXRJbnN0YW5jZSo+KGluc3QpOwogCi0gICAgUUJ5dGVBcnJheSBu YW1lKGlkZW50aWZpZXIuYXNjaWkoKSk7CisgICAgY29uc3QgVVN0cmluZyYgdXN0cmluZyA9IGlk ZW50aWZpZXIudXN0cmluZygpOworICAgIGNvbnN0IFFCeXRlQXJyYXkgbmFtZSA9IFFTdHJpbmco cmVpbnRlcnByZXRfY2FzdDxjb25zdCBRQ2hhcio+KHVzdHJpbmcuZGF0YSgpKSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVzdHJpbmcuc2l6ZSgpKS50b0FzY2lpKCk7CiAK ICAgICAvLyBGaXJzdCBzZWUgaWYgd2UgaGF2ZSBhIGNhY2hlIGhpdAogICAgIEpTT2JqZWN0KiB2 YWwgPSBxdGluc3QtPm1fbWV0aG9kcy52YWx1ZShuYW1lKTsKQEAgLTc4LDcgKzgwLDcgQEAgSlNW YWx1ZSBRdENsYXNzOjpmYWxsYmFja09iamVjdChFeGVjU3RhdGUqIGV4ZWMsIEluc3RhbmNlKiBp bnN0LCBjb25zdCBJZGVudGlmaWUKICAgICAgICAgcmV0dXJuIHZhbDsKIAogICAgIC8vIE5vcGUs IGNyZWF0ZSBhbiBlbnRyeQotICAgIFFCeXRlQXJyYXkgbm9ybWFsID0gUU1ldGFPYmplY3Q6Om5v cm1hbGl6ZWRTaWduYXR1cmUobmFtZS5jb25zdERhdGEoKSk7CisgICAgY29uc3QgUUJ5dGVBcnJh eSBub3JtYWwgPSBRTWV0YU9iamVjdDo6bm9ybWFsaXplZFNpZ25hdHVyZShuYW1lLmNvbnN0RGF0 YSgpKTsKIAogICAgIC8vIFNlZSBpZiB0aGVyZSBpcyBhbiBleGFjdCBtYXRjaAogICAgIGludCBp bmRleCA9IC0xOwpAQCAtOTIsNyArOTQsNyBAQCBKU1ZhbHVlIFF0Q2xhc3M6OmZhbGxiYWNrT2Jq ZWN0KEV4ZWNTdGF0ZSogZXhlYywgSW5zdGFuY2UqIGluc3QsIGNvbnN0IElkZW50aWZpZQogICAg IH0KIAogICAgIC8vIE5vcGUuLiB0cnkgYSBiYXNlbmFtZSBtYXRjaAotICAgIGludCBjb3VudCA9 IG1fbWV0YU9iamVjdC0+bWV0aG9kQ291bnQoKTsKKyAgICBjb25zdCBpbnQgY291bnQgPSBtX21l dGFPYmplY3QtPm1ldGhvZENvdW50KCk7CiAgICAgZm9yIChpbmRleCA9IGNvdW50IC0gMTsgaW5k ZXggPj0gMDsgLS1pbmRleCkgewogICAgICAgICBjb25zdCBRTWV0YU1ldGhvZCBtID0gbV9tZXRh T2JqZWN0LT5tZXRob2QoaW5kZXgpOwogICAgICAgICBpZiAobS5hY2Nlc3MoKSA9PSBRTWV0YU1l dGhvZDo6UHJpdmF0ZSkKQEAgLTEyNiwxMiArMTI4LDEyIEBAIEZpZWxkKiBRdENsYXNzOjpmaWVs ZE5hbWVkKGNvbnN0IElkZW50aWZpZXImIGlkZW50aWZpZXIsIEluc3RhbmNlKiBpbnN0YW5jZSkg Y29uCiAgICAgUXRJbnN0YW5jZSogcXRpbnN0ID0gc3RhdGljX2Nhc3Q8UXRJbnN0YW5jZSo+KGlu c3RhbmNlKTsKIAogICAgIFFPYmplY3QqIG9iaiA9IHF0aW5zdC0+Z2V0T2JqZWN0KCk7Ci0gICAg VVN0cmluZyB1c3RyaW5nID0gaWRlbnRpZmllci51c3RyaW5nKCk7Ci0gICAgUVN0cmluZyBvYmpO YW1lKChjb25zdCBRQ2hhciopdXN0cmluZy5yZXAoKS0+Y2hhcmFjdGVycygpLCB1c3RyaW5nLnNp emUoKSk7Ci0gICAgUUJ5dGVBcnJheSBiYSA9IG9iak5hbWUudG9Bc2NpaSgpOworICAgIGNvbnN0 IFVTdHJpbmcmIHVzdHJpbmcgPSBpZGVudGlmaWVyLnVzdHJpbmcoKTsKKyAgICBjb25zdCBRU3Ry aW5nIG5hbWUocmVpbnRlcnByZXRfY2FzdDxjb25zdCBRQ2hhcio+KHVzdHJpbmcuZGF0YSgpKSwg dXN0cmluZy5zaXplKCkpOworICAgIGNvbnN0IFFCeXRlQXJyYXkgYXNjaWkgPSBuYW1lLnRvQXNj aWkoKTsKIAogICAgIC8vIEZpcnN0IGNoZWNrIGZvciBhIGNhY2hlZCBmaWVsZAotICAgIFF0Rmll bGQqIGYgPSBxdGluc3QtPm1fZmllbGRzLnZhbHVlKG9iak5hbWUpOworICAgIFF0RmllbGQqIGYg PSBxdGluc3QtPm1fZmllbGRzLnZhbHVlKG5hbWUpOwogCiAgICAgaWYgKG9iaikgewogICAgICAg ICBpZiAoZikgewpAQCAtMTQxLDU4ICsxNDMsNjAgQEAgRmllbGQqIFF0Q2xhc3M6OmZpZWxkTmFt ZWQoY29uc3QgSWRlbnRpZmllciYgaWRlbnRpZmllciwgSW5zdGFuY2UqIGluc3RhbmNlKSBjb24K ICAgICAgICAgICAgICAgICByZXR1cm4gZjsKICNpZm5kZWYgUVRfTk9fUFJPUEVSVElFUwogICAg ICAgICAgICAgZWxzZSBpZiAoZi0+ZmllbGRUeXBlKCkgPT0gUXRGaWVsZDo6RHluYW1pY1Byb3Bl cnR5KSB7Ci0gICAgICAgICAgICAgICAgaWYgKG9iai0+ZHluYW1pY1Byb3BlcnR5TmFtZXMoKS5p bmRleE9mKGJhKSA+PSAwKQorICAgICAgICAgICAgICAgIGlmIChvYmotPmR5bmFtaWNQcm9wZXJ0 eU5hbWVzKCkuaW5kZXhPZihhc2NpaSkgPj0gMCkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IGY7CiAgICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIER5bmFt aWMgcHJvcGVydHkgdGhhdCBkaXNhcHBlYXJlZAotICAgICAgICAgICAgICAgICAgICBxdGluc3Qt Pm1fZmllbGRzLnJlbW92ZShvYmpOYW1lKTsKKyAgICAgICAgICAgICAgICAgICAgcXRpbnN0LT5t X2ZpZWxkcy5yZW1vdmUobmFtZSk7CiAgICAgICAgICAgICAgICAgICAgIGRlbGV0ZSBmOwogICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICNlbmRpZgogICAgICAgICAgICAgZWxzZSB7 Ci0gICAgICAgICAgICAgICAgUUxpc3Q8UU9iamVjdCo+IGNoaWxkcmVuID0gb2JqLT5jaGlsZHJl bigpOwotICAgICAgICAgICAgICAgIGZvciAoaW50IGluZGV4ID0gMDsgaW5kZXggPCBjaGlsZHJl bi5jb3VudCgpOyArK2luZGV4KSB7CisgICAgICAgICAgICAgICAgY29uc3QgUUxpc3Q8UU9iamVj dCo+JiBjaGlsZHJlbiA9IG9iai0+Y2hpbGRyZW4oKTsKKyAgICAgICAgICAgICAgICBjb25zdCBp bnQgY291bnQgPSBjaGlsZHJlbi5zaXplKCk7CisgICAgICAgICAgICAgICAgZm9yIChpbnQgaW5k ZXggPSAwOyBpbmRleCA8IGNvdW50OyArK2luZGV4KSB7CiAgICAgICAgICAgICAgICAgICAgIFFP YmplY3QgKmNoaWxkID0gY2hpbGRyZW4uYXQoaW5kZXgpOwotICAgICAgICAgICAgICAgICAgICBp ZiAoY2hpbGQtPm9iamVjdE5hbWUoKSA9PSBvYmpOYW1lKQorICAgICAgICAgICAgICAgICAgICBp ZiAoY2hpbGQtPm9iamVjdE5hbWUoKSA9PSBuYW1lKQogICAgICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIGY7CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAgICAgLy8gRGlkbid0 IGZpbmQgaXQsIGRlbGV0ZSBpdCBmcm9tIHRoZSBjYWNoZQotICAgICAgICAgICAgICAgIHF0aW5z dC0+bV9maWVsZHMucmVtb3ZlKG9iak5hbWUpOworICAgICAgICAgICAgICAgIHF0aW5zdC0+bV9m aWVsZHMucmVtb3ZlKG5hbWUpOwogICAgICAgICAgICAgICAgIGRlbGV0ZSBmOwogICAgICAgICAg ICAgfQogICAgICAgICB9CiAKLSAgICAgICAgaW50IGluZGV4ID0gbV9tZXRhT2JqZWN0LT5pbmRl eE9mUHJvcGVydHkoaWRlbnRpZmllci5hc2NpaSgpKTsKKyAgICAgICAgaW50IGluZGV4ID0gbV9t ZXRhT2JqZWN0LT5pbmRleE9mUHJvcGVydHkoYXNjaWkpOwogICAgICAgICBpZiAoaW5kZXggPj0g MCkgewotICAgICAgICAgICAgUU1ldGFQcm9wZXJ0eSBwcm9wID0gbV9tZXRhT2JqZWN0LT5wcm9w ZXJ0eShpbmRleCk7CisgICAgICAgICAgICBjb25zdCBRTWV0YVByb3BlcnR5IHByb3AgPSBtX21l dGFPYmplY3QtPnByb3BlcnR5KGluZGV4KTsKIAogICAgICAgICAgICAgaWYgKHByb3AuaXNTY3Jp cHRhYmxlKG9iaikpIHsKICAgICAgICAgICAgICAgICBmID0gbmV3IFF0RmllbGQocHJvcCk7Ci0g ICAgICAgICAgICAgICAgcXRpbnN0LT5tX2ZpZWxkcy5pbnNlcnQob2JqTmFtZSwgZik7CisgICAg ICAgICAgICAgICAgcXRpbnN0LT5tX2ZpZWxkcy5pbnNlcnQobmFtZSwgZik7CiAgICAgICAgICAg ICAgICAgcmV0dXJuIGY7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogI2lmbmRlZiBRVF9O T19QUk9QRVJUSUVTCiAgICAgICAgIC8vIER5bmFtaWMgcHJvcGVydGllcwotICAgICAgICBpbmRl eCA9IG9iai0+ZHluYW1pY1Byb3BlcnR5TmFtZXMoKS5pbmRleE9mKGJhKTsKKyAgICAgICAgaW5k ZXggPSBvYmotPmR5bmFtaWNQcm9wZXJ0eU5hbWVzKCkuaW5kZXhPZihhc2NpaSk7CiAgICAgICAg IGlmIChpbmRleCA+PSAwKSB7Ci0gICAgICAgICAgICBmID0gbmV3IFF0RmllbGQoYmEpOwotICAg ICAgICAgICAgcXRpbnN0LT5tX2ZpZWxkcy5pbnNlcnQob2JqTmFtZSwgZik7CisgICAgICAgICAg ICBmID0gbmV3IFF0RmllbGQoYXNjaWkpOworICAgICAgICAgICAgcXRpbnN0LT5tX2ZpZWxkcy5p bnNlcnQobmFtZSwgZik7CiAgICAgICAgICAgICByZXR1cm4gZjsKICAgICAgICAgfQogI2VuZGlm CiAKICAgICAgICAgLy8gQ2hpbGQgb2JqZWN0cwogCi0gICAgICAgIFFMaXN0PFFPYmplY3QqPiBj aGlsZHJlbiA9IG9iai0+Y2hpbGRyZW4oKTsKLSAgICAgICAgZm9yIChpbmRleCA9IDA7IGluZGV4 IDwgY2hpbGRyZW4uY291bnQoKTsgKytpbmRleCkgeworICAgICAgICBjb25zdCBRTGlzdDxRT2Jq ZWN0Kj4mIGNoaWxkcmVuID0gb2JqLT5jaGlsZHJlbigpOworICAgICAgICBjb25zdCBpbnQgY291 bnQgPSBjaGlsZHJlbi5jb3VudCgpOworICAgICAgICBmb3IgKGluZGV4ID0gMDsgaW5kZXggPCBj b3VudDsgKytpbmRleCkgewogICAgICAgICAgICAgUU9iamVjdCAqY2hpbGQgPSBjaGlsZHJlbi5h dChpbmRleCk7Ci0gICAgICAgICAgICBpZiAoY2hpbGQtPm9iamVjdE5hbWUoKSA9PSBvYmpOYW1l KSB7CisgICAgICAgICAgICBpZiAoY2hpbGQtPm9iamVjdE5hbWUoKSA9PSBuYW1lKSB7CiAgICAg ICAgICAgICAgICAgZiA9IG5ldyBRdEZpZWxkKGNoaWxkKTsKLSAgICAgICAgICAgICAgICBxdGlu c3QtPm1fZmllbGRzLmluc2VydChvYmpOYW1lLCBmKTsKKyAgICAgICAgICAgICAgICBxdGluc3Qt Pm1fZmllbGRzLmluc2VydChuYW1lLCBmKTsKICAgICAgICAgICAgICAgICByZXR1cm4gZjsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtMjAwLDE5ICsyMDQsMTggQEAgRmllbGQqIFF0Q2xh c3M6OmZpZWxkTmFtZWQoY29uc3QgSWRlbnRpZmllciYgaWRlbnRpZmllciwgSW5zdGFuY2UqIGlu c3RhbmNlKSBjb24KICAgICAgICAgLy8gTm90aGluZyBuYW1lZCB0aGlzCiAgICAgICAgIHJldHVy biAwOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIFFCeXRlQXJyYXkgYmEoaWRlbnRpZmllci5hc2Np aSgpKTsKICAgICAgICAgLy8gRm9yIGNvbXBhdGliaWxpdHkgd2l0aCBxdHNjcmlwdCwgY2FjaGVk IG1ldGhvZHMgZG9uJ3QgY2F1c2UKICAgICAgICAgLy8gZXJyb3JzIHVudGlsIHRoZXkgYXJlIGFj Y2Vzc2VkLCBzbyBkb24ndCBibGluZGx5IGNyZWF0ZSBhbiBlcnJvcgogICAgICAgICAvLyBoZXJl LgotICAgICAgICBpZiAocXRpbnN0LT5tX21ldGhvZHMuY29udGFpbnMoYmEpKQorICAgICAgICBp ZiAocXRpbnN0LT5tX21ldGhvZHMuY29udGFpbnMoYXNjaWkpKQogICAgICAgICAgICAgcmV0dXJu IDA7CiAKICNpZm5kZWYgUVRfTk9fUFJPUEVSVElFUwogICAgICAgICAvLyBkZWxldGVkIHFvYmpl Y3QsIGJ1dCBjYW4ndCB0aHJvdyBhbiBlcnJvciBmcm9tIGhlcmUgKG5vIGV4ZWMpCiAgICAgICAg IC8vIGNyZWF0ZSBhIGZha2UgUXRGaWVsZCB0aGF0IHdpbGwgdGhyb3cgdXBvbiBhY2Nlc3MKICAg ICAgICAgaWYgKCFmKSB7Ci0gICAgICAgICAgICBmID0gbmV3IFF0RmllbGQoYmEpOwotICAgICAg ICAgICAgcXRpbnN0LT5tX2ZpZWxkcy5pbnNlcnQob2JqTmFtZSwgZik7CisgICAgICAgICAgICBm ID0gbmV3IFF0RmllbGQoYXNjaWkpOworICAgICAgICAgICAgcXRpbnN0LT5tX2ZpZWxkcy5pbnNl cnQobmFtZSwgZik7CiAgICAgICAgIH0KICNlbmRpZgogICAgICAgICByZXR1cm4gZjsK