71614 2011-11-05 16:25:58 -0700 [GTK] Actually use the user_data arguments to gio async functions 2011-11-05 17:50:59 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 danw webkit-unassigned mrobinson webkit.review.bot oldest_to_newest 496721 0 danw 2011-11-05 16:25:58 -0700 see patch 496724 1 113767 danw 2011-11-05 16:26:47 -0700 Created attachment 113767 Actually use the user_data arguments to gio async functions 496728 2 113767 webkit.review.bot 2011-11-05 16:34:58 -0700 Comment on attachment 113767 Actually use the user_data arguments to gio async functions Rejecting attachment 113767 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: fuzz 3. patching file Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp Hunk #4 succeeded at 486 with fuzz 2. Hunk #9 FAILED at 802. Hunk #10 succeeded at 840 (offset 1 line). Hunk #11 FAILED at 855. Hunk #12 succeeded at 886 (offset 7 lines). 2 out of 12 hunks FAILED -- saving rejects to file Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Martin Robinson', u'--..." exit_code: 1 Full output: http://queues.webkit.org/results/10332332 496729 3 mrobinson 2011-11-05 16:36:34 -0700 This patch may need to be rebaselined to the current master. 496730 4 danw 2011-11-05 16:45:40 -0700 no, the bot just tried to commit them in the wrong order... you should be able to commit-queue+ it again after it commits 71613 496745 5 113767 webkit.review.bot 2011-11-05 17:50:53 -0700 Comment on attachment 113767 Actually use the user_data arguments to gio async functions Clearing flags on attachment: 113767 Committed r99364: <http://trac.webkit.org/changeset/99364> 496746 6 webkit.review.bot 2011-11-05 17:50:59 -0700 All reviewed patches have been landed. Closing bug. 113767 2011-11-05 16:26:47 -0700 2011-11-05 17:50:53 -0700 Actually use the user_data arguments to gio async functions 0001-GTK-Actually-use-the-user_data-arguments-to-gio-asyn.patch text/plain 8639 danw RnJvbSAxYTU4ZDMyMDUwNGUzNTBlNWE5ZGJkYjUyMjgyOWE1ZTFkZTgwZjFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYW4gV2luc2hpcCA8ZGFud0Bnbm9tZS5vcmc+CkRhdGU6IFN1 biwgMjMgT2N0IDIwMTEgMjE6MTU6MzcgLTA0MDAKU3ViamVjdDogW1BBVENIXSBbR1RLXSBBY3R1 YWxseSB1c2UgdGhlIHVzZXJfZGF0YSBhcmd1bWVudHMgdG8gZ2lvIGFzeW5jCiBmdW5jdGlvbnMK Cmluc3RlYWQgb2YgdXNpbmcgZ19vYmplY3Rfc2V0X2RhdGEoKSB0byBiYXNpY2FsbHkgcmVpbnZl bnQgdGhlbS4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICB8ICAgMjAgKysrKysrKysKIC4uLi9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3Vy Y2VIYW5kbGVTb3VwLmNwcCAgIHwgICA0NyArKysrKystLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCAzNCBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTM4MjUyYi4uY2ZjOTQ5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI1IEBACiAyMDExLTExLTA1 ICBEYW4gV2luc2hpcCAgPGRhbndAZ25vbWUub3JnPgogCisgICAgICAgIFtHVEtdIEFjdHVhbGx5 IHVzZSB0aGUgdXNlcl9kYXRhIGFyZ3VtZW50cyB0byBnaW8gYXN5bmMgZnVuY3Rpb25zCisgICAg ICAgIGluc3RlYWQgb2YgdXNpbmcgZ19vYmplY3Rfc2V0X2RhdGEoKSB0byBiYXNpY2FsbHkgcmVp bnZlbnQgdGhlbS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcxNjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzOyBiZWhhdmlvciBpcyB1bmNoYW5nZWQKKworICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VIYW5kbGVJbnRlcm5hbDo6flJlc291cmNlSGFuZGxlSW50ZXJuYWwpOgorICAg ICAgICAoV2ViQ29yZTo6Y2xlYW51cFNvdXBSZXF1ZXN0T3BlcmF0aW9uKToKKyAgICAgICAgKFdl YkNvcmU6OnNlbmRSZXF1ZXN0Q2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6c3RhcnRIVFRQ UmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6cGxhdGZvcm1TZXRE ZWZlcnNMb2FkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OmNsb3NlQ2FsbGJhY2spOgorICAgICAg ICAoV2ViQ29yZTo6cmVhZENhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OnN0YXJ0Tm9uSFRU UFJlcXVlc3QpOgorCisyMDExLTExLTA1ICBEYW4gV2luc2hpcCAgPGRhbndAZ25vbWUub3JnPgor CiAgICAgICAgIFtHVEtdIFJlbW92ZSBhIGJpdCBvZiBkZWFkIGNvZGUKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcxNjEzCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291 cC5jcHAKaW5kZXggYzg1Zjg0My4uYTliMDdkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKQEAg LTEzOSw4ICsxMzksNiBAQCBzdGF0aWMgYm9vbCBzdGFydE5vbkhUVFBSZXF1ZXN0KFJlc291cmNl SGFuZGxlKiwgS1VSTCk7CiAKIFJlc291cmNlSGFuZGxlSW50ZXJuYWw6On5SZXNvdXJjZUhhbmRs ZUludGVybmFsKCkKIHsKLSAgICBpZiAobV9zb3VwUmVxdWVzdCkKLSAgICAgICAgZ19vYmplY3Rf c2V0X2RhdGEoR19PQkpFQ1QobV9zb3VwUmVxdWVzdC5nZXQoKSksICJ3ZWJraXQtcmVzb3VyY2Ui LCAwKTsKIH0KIAogUmVzb3VyY2VIYW5kbGU6On5SZXNvdXJjZUhhbmRsZSgpCkBAIC0zNzgsMTUg KzM3NiwxMSBAQCBzdGF0aWMgdm9pZCBjbGVhbnVwU291cFJlcXVlc3RPcGVyYXRpb24oUmVzb3Vy Y2VIYW5kbGUqIGhhbmRsZSwgYm9vbCBpc0Rlc3Ryb3lpbgogewogICAgIFJlc291cmNlSGFuZGxl SW50ZXJuYWwqIGQgPSBoYW5kbGUtPmdldEludGVybmFsKCk7CiAKLSAgICBpZiAoZC0+bV9zb3Vw UmVxdWVzdCkgewotICAgICAgICBnX29iamVjdF9zZXRfZGF0YShHX09CSkVDVChkLT5tX3NvdXBS ZXF1ZXN0LmdldCgpKSwgIndlYmtpdC1yZXNvdXJjZSIsIDApOworICAgIGlmIChkLT5tX3NvdXBS ZXF1ZXN0KQogICAgICAgICBkLT5tX3NvdXBSZXF1ZXN0LmNsZWFyKCk7Ci0gICAgfQogCi0gICAg aWYgKGQtPm1faW5wdXRTdHJlYW0pIHsKLSAgICAgICAgZ19vYmplY3Rfc2V0X2RhdGEoR19PQkpF Q1QoZC0+bV9pbnB1dFN0cmVhbS5nZXQoKSksICJ3ZWJraXQtcmVzb3VyY2UiLCAwKTsKKyAgICBp ZiAoZC0+bV9pbnB1dFN0cmVhbSkKICAgICAgICAgZC0+bV9pbnB1dFN0cmVhbS5jbGVhcigpOwot ICAgIH0KIAogICAgIGQtPm1fY2FuY2VsbGFibGUuY2xlYXIoKTsKIApAQCAtNDMxLDExICs0MjUs OSBAQCBzdGF0aWMgUmVzb3VyY2VFcnJvciBjb252ZXJ0U291cEVycm9yVG9SZXNvdXJjZUVycm9y KEdFcnJvciogZXJyb3IsIFNvdXBSZXF1ZXN0KgogICAgICAgICAgICAgICAgICAgICAgICAgIFN0 cmluZzo6ZnJvbVVURjgoZXJyb3ItPm1lc3NhZ2UpKTsKIH0KIAotc3RhdGljIHZvaWQgc2VuZFJl cXVlc3RDYWxsYmFjayhHT2JqZWN0KiBzb3VyY2UsIEdBc3luY1Jlc3VsdCogcmVzLCBncG9pbnRl ciB1c2VyRGF0YSkKK3N0YXRpYyB2b2lkIHNlbmRSZXF1ZXN0Q2FsbGJhY2soR09iamVjdCogc291 cmNlLCBHQXN5bmNSZXN1bHQqIHJlcywgZ3BvaW50ZXIgZGF0YSkKIHsKLSAgICBSZWZQdHI8UmVz b3VyY2VIYW5kbGU+IGhhbmRsZSA9IHN0YXRpY19jYXN0PFJlc291cmNlSGFuZGxlKj4oZ19vYmpl Y3RfZ2V0X2RhdGEoc291cmNlLCAid2Via2l0LXJlc291cmNlIikpOwotICAgIGlmICghaGFuZGxl KQotICAgICAgICByZXR1cm47CisgICAgUmVmUHRyPFJlc291cmNlSGFuZGxlPiBoYW5kbGUgPSBz dGF0aWNfY2FzdDxSZXNvdXJjZUhhbmRsZSo+KGRhdGEpOwogCiAgICAgUmVzb3VyY2VIYW5kbGVJ bnRlcm5hbCogZCA9IGhhbmRsZS0+Z2V0SW50ZXJuYWwoKTsKICAgICBSZXNvdXJjZUhhbmRsZUNs aWVudCogY2xpZW50ID0gaGFuZGxlLT5jbGllbnQoKTsKQEAgLTQ5NCw5ICs0ODYsNiBAQCBzdGF0 aWMgdm9pZCBzZW5kUmVxdWVzdENhbGxiYWNrKEdPYmplY3QqIHNvdXJjZSwgR0FzeW5jUmVzdWx0 KiByZXMsIGdwb2ludGVyIHVzZQogICAgIGQtPm1faW5wdXRTdHJlYW0gPSBhZG9wdEdSZWYoaW4p OwogICAgIGQtPm1fYnVmZmVyID0gc3RhdGljX2Nhc3Q8Y2hhcio+KGdfc2xpY2VfYWxsb2MoUkVB RF9CVUZGRVJfU0laRSkpOwogCi0gICAgLy8gcmVhZENhbGxiYWNrIG5lZWRzIGl0Ci0gICAgZ19v YmplY3Rfc2V0X2RhdGEoR19PQkpFQ1QoZC0+bV9pbnB1dFN0cmVhbS5nZXQoKSksICJ3ZWJraXQt cmVzb3VyY2UiLCBoYW5kbGUuZ2V0KCkpOwotCiAgICAgLy8gSWYgbm90IHVzaW5nIFNvdXBNZXNz YWdlIHdlIG5lZWQgdG8gY2FsbCBkaWRSZWNlaXZlUmVzcG9uc2Ugbm93LgogICAgIC8vIChUaGlz IHdpbGwgY2hhbmdlIGxhdGVyIHdoZW4gU291cFJlcXVlc3Qgc3VwcG9ydHMgY29udGVudCBzbmlm ZmluZy4pCiAgICAgaWYgKCFkLT5tX3NvdXBNZXNzYWdlKSB7CkBAIC01MTcsNyArNTA2LDcgQEAg c3RhdGljIHZvaWQgc2VuZFJlcXVlc3RDYWxsYmFjayhHT2JqZWN0KiBzb3VyY2UsIEdBc3luY1Jl c3VsdCogcmVzLCBncG9pbnRlciB1c2UKICAgICAgICAgIHNvdXBfc2Vzc2lvbl9wYXVzZV9tZXNz YWdlKGhhbmRsZS0+ZGVmYXVsdFNlc3Npb24oKSwgZC0+bV9zb3VwTWVzc2FnZS5nZXQoKSk7CiAK ICAgICBnX2lucHV0X3N0cmVhbV9yZWFkX2FzeW5jKGQtPm1faW5wdXRTdHJlYW0uZ2V0KCksIGQt Pm1fYnVmZmVyLCBSRUFEX0JVRkZFUl9TSVpFLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgR19QUklPUklUWV9ERUZBVUxULCBkLT5tX2NhbmNlbGxhYmxlLmdldCgpLCByZWFkQ2FsbGJh Y2ssIDApOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR19QUklPUklUWV9ERUZBVUxU LCBkLT5tX2NhbmNlbGxhYmxlLmdldCgpLCByZWFkQ2FsbGJhY2ssIGhhbmRsZS5nZXQoKSk7CiB9 CiAKIHN0YXRpYyBib29sIGFkZEZpbGVUb1NvdXBNZXNzYWdlQm9keShTb3VwTWVzc2FnZSogbWVz c2FnZSwgY29uc3QgU3RyaW5nJiBmaWxlTmFtZVN0cmluZywgc2l6ZV90IG9mZnNldCwgc2l6ZV90 IGxlbmd0aFRvU2VuZCwgdW5zaWduZWQgbG9uZyYgdG90YWxCb2R5U2l6ZSkKQEAgLTY0Nyw4ICs2 MzYsNiBAQCBzdGF0aWMgYm9vbCBzdGFydEhUVFBSZXF1ZXN0KFJlc291cmNlSGFuZGxlKiBoYW5k bGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICBnX29iamVjdF9zZXRfZGF0 YShHX09CSkVDVChkLT5tX3NvdXBSZXF1ZXN0LmdldCgpKSwgIndlYmtpdC1yZXNvdXJjZSIsIGhh bmRsZSk7Ci0KICAgICBkLT5tX3NvdXBNZXNzYWdlID0gYWRvcHRHUmVmKHNvdXBfcmVxdWVzdF9o dHRwX2dldF9tZXNzYWdlKFNPVVBfUkVRVUVTVF9IVFRQKGQtPm1fc291cFJlcXVlc3QuZ2V0KCkp KSk7CiAgICAgaWYgKCFkLT5tX3NvdXBNZXNzYWdlKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBA IC02OTQsNyArNjgxLDcgQEAgc3RhdGljIGJvb2wgc3RhcnRIVFRQUmVxdWVzdChSZXNvdXJjZUhh bmRsZSogaGFuZGxlKQogICAgIC8vIFNlbmQgdGhlIHJlcXVlc3Qgb25seSBpZiBpdCdzIG5vdCBi ZWVuIGV4cGxpY2l0ZWx5IGRlZmVycmVkLgogICAgIGlmICghZC0+bV9kZWZlcnNMb2FkaW5nKSB7 CiAgICAgICAgIGQtPm1fY2FuY2VsbGFibGUgPSBhZG9wdEdSZWYoZ19jYW5jZWxsYWJsZV9uZXco KSk7Ci0gICAgICAgIHNvdXBfcmVxdWVzdF9zZW5kX2FzeW5jKGQtPm1fc291cFJlcXVlc3QuZ2V0 KCksIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCksIHNlbmRSZXF1ZXN0Q2FsbGJhY2ssIDApOworICAg ICAgICBzb3VwX3JlcXVlc3Rfc2VuZF9hc3luYyhkLT5tX3NvdXBSZXF1ZXN0LmdldCgpLCBkLT5t X2NhbmNlbGxhYmxlLmdldCgpLCBzZW5kUmVxdWVzdENhbGxiYWNrLCBoYW5kbGUpOwogICAgIH0K IAogICAgIHJldHVybiB0cnVlOwpAQCAtNzYwLDcgKzc0Nyw3IEBAIHZvaWQgUmVzb3VyY2VIYW5k bGU6OnBsYXRmb3JtU2V0RGVmZXJzTG9hZGluZyhib29sIGRlZmVyc0xvYWRpbmcpCiAKICAgICBp ZiAoIWRlZmVyc0xvYWRpbmcgJiYgIWQtPm1fY2FuY2VsbGFibGUgJiYgZC0+bV9zb3VwUmVxdWVz dC5nZXQoKSkgewogICAgICAgICBkLT5tX2NhbmNlbGxhYmxlID0gYWRvcHRHUmVmKGdfY2FuY2Vs bGFibGVfbmV3KCkpOwotICAgICAgICBzb3VwX3JlcXVlc3Rfc2VuZF9hc3luYyhkLT5tX3NvdXBS ZXF1ZXN0LmdldCgpLCBkLT5tX2NhbmNlbGxhYmxlLmdldCgpLCBzZW5kUmVxdWVzdENhbGxiYWNr LCAwKTsKKyAgICAgICAgc291cF9yZXF1ZXN0X3NlbmRfYXN5bmMoZC0+bV9zb3VwUmVxdWVzdC5n ZXQoKSwgZC0+bV9jYW5jZWxsYWJsZS5nZXQoKSwgc2VuZFJlcXVlc3RDYWxsYmFjaywgdGhpcyk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTgxNSwyMiArODAyLDE4IEBAIHZvaWQgUmVz b3VyY2VIYW5kbGU6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoTmV0d29ya2luZ0NvbnRleHQq IGNvbnRleHQsIGNvbnN0CiAgICAgc3luY0xvYWRlci5ydW4oKTsKIH0KIAotc3RhdGljIHZvaWQg Y2xvc2VDYWxsYmFjayhHT2JqZWN0KiBzb3VyY2UsIEdBc3luY1Jlc3VsdCogcmVzLCBncG9pbnRl cikKK3N0YXRpYyB2b2lkIGNsb3NlQ2FsbGJhY2soR09iamVjdCogc291cmNlLCBHQXN5bmNSZXN1 bHQqIHJlcywgZ3BvaW50ZXIgZGF0YSkKIHsKLSAgICBSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IGhh bmRsZSA9IHN0YXRpY19jYXN0PFJlc291cmNlSGFuZGxlKj4oZ19vYmplY3RfZ2V0X2RhdGEoc291 cmNlLCAid2Via2l0LXJlc291cmNlIikpOwotICAgIGlmICghaGFuZGxlKQotICAgICAgICByZXR1 cm47CisgICAgUmVmUHRyPFJlc291cmNlSGFuZGxlPiBoYW5kbGUgPSBzdGF0aWNfY2FzdDxSZXNv dXJjZUhhbmRsZSo+KGRhdGEpOwogCiAgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCogZCA9IGhh bmRsZS0+Z2V0SW50ZXJuYWwoKTsKICAgICBnX2lucHV0X3N0cmVhbV9jbG9zZV9maW5pc2goZC0+ bV9pbnB1dFN0cmVhbS5nZXQoKSwgcmVzLCAwKTsKICAgICBjbGVhbnVwU291cFJlcXVlc3RPcGVy YXRpb24oaGFuZGxlLmdldCgpKTsKIH0KIAotc3RhdGljIHZvaWQgcmVhZENhbGxiYWNrKEdPYmpl Y3QqIHNvdXJjZSwgR0FzeW5jUmVzdWx0KiBhc3luY1Jlc3VsdCwgZ3BvaW50ZXIpCitzdGF0aWMg dm9pZCByZWFkQ2FsbGJhY2soR09iamVjdCogc291cmNlLCBHQXN5bmNSZXN1bHQqIGFzeW5jUmVz dWx0LCBncG9pbnRlciBkYXRhKQogewotICAgIFJlZlB0cjxSZXNvdXJjZUhhbmRsZT4gaGFuZGxl ID0gc3RhdGljX2Nhc3Q8UmVzb3VyY2VIYW5kbGUqPihnX29iamVjdF9nZXRfZGF0YShzb3VyY2Us ICJ3ZWJraXQtcmVzb3VyY2UiKSk7Ci0gICAgaWYgKCFoYW5kbGUpCi0gICAgICAgIHJldHVybjsK KyAgICBSZWZQdHI8UmVzb3VyY2VIYW5kbGU+IGhhbmRsZSA9IHN0YXRpY19jYXN0PFJlc291cmNl SGFuZGxlKj4oZGF0YSk7CiAKICAgICBSZXNvdXJjZUhhbmRsZUludGVybmFsKiBkID0gaGFuZGxl LT5nZXRJbnRlcm5hbCgpOwogICAgIFJlc291cmNlSGFuZGxlQ2xpZW50KiBjbGllbnQgPSBoYW5k bGUtPmNsaWVudCgpOwpAQCAtODUyLDcgKzgzNSw3IEBAIHN0YXRpYyB2b2lkIHJlYWRDYWxsYmFj ayhHT2JqZWN0KiBzb3VyY2UsIEdBc3luY1Jlc3VsdCogYXN5bmNSZXN1bHQsIGdwb2ludGVyKQog ICAgICAgICAvLyBXZSBpbmZvcm0gV2ViQ29yZSBvZiBsb2FkIGNvbXBsZXRpb24gbm93IGluc3Rl YWQgb2Ygd2FpdGluZyBmb3IgdGhlIGlucHV0CiAgICAgICAgIC8vIHN0cmVhbSB0byBjbG9zZSBi ZWNhdXNlIHRoZSBpbnB1dCBzdHJlYW0gaXMgY2xvc2VkIGFzeW5jaHJvbm91c2x5LgogICAgICAg ICBjbGllbnQtPmRpZEZpbmlzaExvYWRpbmcoaGFuZGxlLmdldCgpLCAwKTsKLSAgICAgICAgZ19p bnB1dF9zdHJlYW1fY2xvc2VfYXN5bmMoZC0+bV9pbnB1dFN0cmVhbS5nZXQoKSwgR19QUklPUklU WV9ERUZBVUxULCAwLCBjbG9zZUNhbGxiYWNrLCAwKTsKKyAgICAgICAgZ19pbnB1dF9zdHJlYW1f Y2xvc2VfYXN5bmMoZC0+bV9pbnB1dFN0cmVhbS5nZXQoKSwgR19QUklPUklUWV9ERUZBVUxULCAw LCBjbG9zZUNhbGxiYWNrLCBoYW5kbGUuZ2V0KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQog CkBAIC04NjgsNyArODUxLDcgQEAgc3RhdGljIHZvaWQgcmVhZENhbGxiYWNrKEdPYmplY3QqIHNv dXJjZSwgR0FzeW5jUmVzdWx0KiBhc3luY1Jlc3VsdCwgZ3BvaW50ZXIpCiAgICAgfQogCiAgICAg Z19pbnB1dF9zdHJlYW1fcmVhZF9hc3luYyhkLT5tX2lucHV0U3RyZWFtLmdldCgpLCBkLT5tX2J1 ZmZlciwgUkVBRF9CVUZGRVJfU0laRSwgR19QUklPUklUWV9ERUZBVUxULAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZC0+bV9jYW5jZWxsYWJsZS5nZXQoKSwgcmVhZENhbGxiYWNrLCAw KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCks IHJlYWRDYWxsYmFjaywgaGFuZGxlLmdldCgpKTsKIH0KIAogc3RhdGljIGJvb2wgc3RhcnROb25I VFRQUmVxdWVzdChSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBLVVJMIHVybCkKQEAgLTg5MiwxMyAr ODc1LDExIEBAIHN0YXRpYyBib29sIHN0YXJ0Tm9uSFRUUFJlcXVlc3QoUmVzb3VyY2VIYW5kbGUq IGhhbmRsZSwgS1VSTCB1cmwpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICBn X29iamVjdF9zZXRfZGF0YShHX09CSkVDVChkLT5tX3NvdXBSZXF1ZXN0LmdldCgpKSwgIndlYmtp dC1yZXNvdXJjZSIsIGhhbmRsZSk7Ci0KICAgICAvLyBiYWxhbmNlZCBieSBhIGRlcmVmKCkgaW4g Y2xlYW51cFNvdXBSZXF1ZXN0T3BlcmF0aW9uLCB3aGljaCBzaG91bGQgYWx3YXlzIHJ1bgogICAg IGhhbmRsZS0+cmVmKCk7CiAKICAgICBkLT5tX2NhbmNlbGxhYmxlID0gYWRvcHRHUmVmKGdfY2Fu Y2VsbGFibGVfbmV3KCkpOwotICAgIHNvdXBfcmVxdWVzdF9zZW5kX2FzeW5jKGQtPm1fc291cFJl cXVlc3QuZ2V0KCksIGQtPm1fY2FuY2VsbGFibGUuZ2V0KCksIHNlbmRSZXF1ZXN0Q2FsbGJhY2ss IDApOworICAgIHNvdXBfcmVxdWVzdF9zZW5kX2FzeW5jKGQtPm1fc291cFJlcXVlc3QuZ2V0KCks IGQtPm1fY2FuY2VsbGFibGUuZ2V0KCksIHNlbmRSZXF1ZXN0Q2FsbGJhY2ssIGhhbmRsZSk7CiAK ICAgICByZXR1cm4gdHJ1ZTsKIH0KLS0gCjEuNy43Cgo=