57877 2011-04-05 13:18:22 -0700 [Qt][WK2][Symbian] Remove use of stack arrays with variable size 2011-04-08 12:30:38 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) S60 Hardware S60 3rd edition RESOLVED FIXED Qt P2 Normal --- 1 s.mathur s.mathur benjamin commit-queue kbalazs laszlo.gombos oldest_to_newest 379827 0 s.mathur 2011-04-05 13:18:22 -0700 RVCT 4.0 behaves badly when stack arrays are declared with unknown-at-build-time number of elements. E.g char myBuffer[object.foo()]; We should simply use new and delete for such arrays to help with compiler portability 379852 1 88306 s.mathur 2011-04-05 14:03:34 -0700 Created attachment 88306 Patch with RVCT 4.0 and/or Symbian fixes 379854 2 88306 s.mathur 2011-04-05 14:05:24 -0700 Comment on attachment 88306 Patch with RVCT 4.0 and/or Symbian fixes The "MessageBodyIsOOL = 1U << 31" change is to fix RVCT 4.0 compiler warnings about attempting to do bit-shift operations on a signed int. 379902 3 88306 kbalazs 2011-04-05 15:22:37 -0700 Comment on attachment 88306 Patch with RVCT 4.0 and/or Symbian fixes View in context: https://bugs.webkit.org/attachment.cgi?id=88306&action=review Informal review. Avoid non-standard C++ is definitely a good idea but there are some problems. > Source/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp:232 > + > + delete[] fileDescriptors; > + delete[] attachmentSizes; Normally we use OwnPtr and OwnArrayPtr for temporary heap allocated memory. Those clean up automatically. > Source/WebKit2/Platform/CoreIPC/qt/ConnectionQt.cpp:367 > + > + delete[] attachmentFDBuffer; > + delete[] attachmentSizes; > + Ditto. > Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp:100 > +#if !OS(SYMBIAN) > + if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sockets) == -1) > +#endif > + { I'm confused by this change. This is the Symbian fix, right? Maybe it should have it's own patch. Anyway, is it good to make the ASSERT_NOT_REACHED() unconditionally on Symbian? 380260 4 benjamin 2011-04-06 04:41:51 -0700 (In reply to comment #0) > RVCT 4.0 behaves badly when stack arrays are declared with unknown-at-build-time number of elements. > > E.g char myBuffer[object.foo()]; Could you explain what happens in this case with RVCT 4? Allocating dynamic arrays on the heap can have serious performance impact (not in this case ofc). Allocating everything on the heap seems ridiculous without a bit more context. 380539 5 s.mathur 2011-04-06 10:14:43 -0700 (In reply to comment #4) > (In reply to comment #0) > > RVCT 4.0 behaves badly when stack arrays are declared with unknown-at-build-time number of elements. > > > > E.g char myBuffer[object.foo()]; > > Could you explain what happens in this case with RVCT 4? > Here are the errors which result during RVCT 4.0 link stage. They appear to happen because the compiler cannot detect the size of the arrays at compile time, and hence inserts references to malloc() and free() (with the wrong visibility?) in the generated code. Error: L6410E: Symbol free with non STV_DEFAULT visibility STV_HIDDEN should be resolved statically, cannot use definition in libc{00010001}.dso. Error: L6410E: Symbol malloc with non STV_DEFAULT visibility STV_HIDDEN should be resolved statically, cannot use definition in libc{00010001}.dso. I used the "fromelf" tool to inspect which source file the unexpected visibility change in malloc and free was coming from, and it turned out to be ConnectionQt.cpp. No other file in WebKit is affected by this issue. http://docs.huihoo.com/symbian/nokia-symbian3-developers-library-v0.8/GUID-0E3E2FAD-FC85-5995-8B5C-8F1C1A4186D0.html 380807 6 kbalazs 2011-04-06 14:01:16 -0700 > No other file in WebKit is affected by this issue. Because generally we do not use variable size arrays (or any other non-standard construction as I know). I think heap allocation is the correct solution here. 380819 7 88510 s.mathur 2011-04-06 14:11:19 -0700 Created attachment 88510 updated patch. Use scoped array (OwnArrayPtr) as suggested. Removed the socketpair change for now. Perhaps I will make a different bug? I would like to get CONFIG+=webkit2 to compile+link correctly on the buildbot before my pure Symbian IPC works starts landing, so as to get a baseline. 380829 8 88510 benjamin 2011-04-06 14:22:37 -0700 Comment on attachment 88510 updated patch. Look reasonable. With the smart pointer it is not too ugly. No tests? ;) 380933 9 commit-queue 2011-04-06 16:03:00 -0700 The commit-queue encountered the following flaky tests while processing attachment 88510: animations/suspend-resume-animation.html bug 48161 (author: cmarrin@apple.com) The commit-queue is continuing to process your patch. 380936 10 88510 commit-queue 2011-04-06 16:06:23 -0700 Comment on attachment 88510 updated patch. Clearing flags on attachment: 88510 Committed r83116: <http://trac.webkit.org/changeset/83116> 380937 11 commit-queue 2011-04-06 16:06:34 -0700 All reviewed patches have been landed. Closing bug. 381373 12 88647 s.mathur 2011-04-07 08:48:34 -0700 Created attachment 88647 Patch to fix Symbian Wk2 build until pure Symbian IPC and process launching is done Please let me know if I should open a new bug. Since the discussion was here, I took the lazy route. 381377 13 s.mathur 2011-04-07 08:49:55 -0700 Reopening for now. 381389 14 88649 s.mathur 2011-04-07 09:05:18 -0700 Created attachment 88649 Minor comment improvement (added "FIXME") 381394 15 88649 laszlo.gombos 2011-04-07 09:12:28 -0700 Comment on attachment 88649 Minor comment improvement (added "FIXME") r=me. 381419 16 88649 commit-queue 2011-04-07 09:42:10 -0700 Comment on attachment 88649 Minor comment improvement (added "FIXME") Clearing flags on attachment: 88649 Committed r83178: <http://trac.webkit.org/changeset/83178> 381420 17 commit-queue 2011-04-07 09:42:16 -0700 All reviewed patches have been landed. Closing bug. 382320 18 88834 s.mathur 2011-04-08 10:00:05 -0700 Created attachment 88834 Rapply patch after r83215 382322 19 s.mathur 2011-04-08 10:01:05 -0700 r83215 accidently un-applied this patch. Resubmit 382327 20 88834 mrobinson 2011-04-08 10:05:29 -0700 Comment on attachment 88834 Rapply patch after r83215 Thanks for resubmitting this. Sorry that I managed to lose it. 382453 21 88834 commit-queue 2011-04-08 12:30:33 -0700 Comment on attachment 88834 Rapply patch after r83215 Clearing flags on attachment: 88834 Committed r83323: <http://trac.webkit.org/changeset/83323> 382454 22 commit-queue 2011-04-08 12:30:38 -0700 All reviewed patches have been landed. Closing bug. 88306 2011-04-05 14:03:34 -0700 2011-04-06 14:11:19 -0700 Patch with RVCT 4.0 and/or Symbian fixes 57877_v1.patch text/plain 5100 s.mathur ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxMmM3MTQ3Li43MzhmYjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDQtMDUgIFNpZGRoYXJ0aCBNYXRodXIgIDxzaWRkaGFydGgubWF0aHVyQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdW1dLMl1bU3ltYmlhbl0gQnVpbGQgZml4ZXM6IHJlbW92ZSB1c2Ugb2Ygc3RhY2sgYXJyYXlz IHdpdGggdmFyaWFibGUgc2l6ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTc4NzcKKworICAgICAgICBLZWVwIFJWQ1QgNC4wIGhhcHB5IGJ5IGF2b2lk aW5nIHVzZSBvZiBzdGFjayBhcnJheXMgd2l0aCB2YXJpYWJsZSBudW1iZXIgb2YgZWxlbWVudHMu IAorICAgICAgICBTdHViIG91dCB1c2Ugb2Ygc29ja2V0cGFpcigpIEFQSSB1bnRpbCBuYXRpdmUg U3ltYmlhbiBJUEMgaW1wbGVtZW50YXRpb24gbGFuZHMuIAorCisgICAgICAgICogUGxhdGZvcm0v Q29yZUlQQy9xdC9Db25uZWN0aW9uUXQuY3BwOiBmaXggY29tcGlsZXIgd2FybmluZyBhYm91dCBi aXRzaGlmdGluZyBzaWduZWQgdmFsdWVzCisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0aW9uOjpy ZWFkeVJlYWRIYW5kbGVyKTogdXNlIGFycmF5cyBtYW5hZ2VkIHdpdGggbmV3L2RlbGV0ZQorICAg ICAgICAoQ29yZUlQQzo6Q29ubmVjdGlvbjo6c2VuZE91dGdvaW5nTWVzc2FnZSk6CisgICAgICAg ICogVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcDogY29tbWVudCBv dXQgdW5hdmFpbGFibGUgY2tldHBhaXIoKQorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzTGF1bmNo ZXI6OmxhdW5jaFByb2Nlc3MpOgorCiAyMDExLTA0LTA1ICBBbGVqYW5kcm8gRy4gQ2FzdHJvICA8 YWxleEBpZ2FsaWEuY29tPgogCiAgICAgICAgIEFub3RoZXIgY29tcGlsYXRpb24gZml4IGFmdGVy IHI4MjkyOSBob3JyaWJsZSBwYXRjaCBtZXJnZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1BsYXRmb3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1Bs YXRmb3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcAppbmRleCAyMjVkN2RjLi43ZWM2OGZm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3F0L0Nvbm5lY3Rp b25RdC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9xdC9Db25uZWN0 aW9uUXQuY3BwCkBAIC00OCw3ICs0OCw3IEBAIHN0YXRpYyBjb25zdCBzaXplX3QgbWVzc2FnZU1h eFNpemUgPSA0MDk2Owogc3RhdGljIGNvbnN0IHNpemVfdCBhdHRhY2htZW50TWF4QW1vdW50ID0g MjU1OwogCiBlbnVtIHsKLSAgICBNZXNzYWdlQm9keUlzT09MID0gMSA8PCAzMQorICAgIE1lc3Nh Z2VCb2R5SXNPT0wgPSAxVSA8PCAzMQogfTsKIAogY2xhc3MgTWVzc2FnZUluZm8gewpAQCAtMTg0 LDEzICsxODQsMTMgQEAgdm9pZCBDb25uZWN0aW9uOjpyZWFkeVJlYWRIYW5kbGVyKCkKIAogICAg IGlmIChtZXNzYWdlSW5mby5hdHRhY2htZW50Q291bnQoKSkgewogICAgICAgICBpZiAoY29udHJv bE1lc3NhZ2UgJiYgY29udHJvbE1lc3NhZ2UtPmNtc2dfbGV2ZWwgPT0gU09MX1NPQ0tFVCAmJiBj b250cm9sTWVzc2FnZS0+Y21zZ190eXBlID09IFNDTV9SSUdIVFMpIHsKLSAgICAgICAgICAgIHNp emVfdCBhdHRhY2htZW50U2l6ZXNbbWVzc2FnZUluZm8uYXR0YWNobWVudENvdW50KCldOwotICAg ICAgICAgICAgbWVtY3B5KGF0dGFjaG1lbnRTaXplcywgbWVzc2FnZURhdGEsIHNpemVvZihhdHRh Y2htZW50U2l6ZXMpKTsKKyAgICAgICAgICAgIHNpemVfdCogYXR0YWNobWVudFNpemVzID0gbmV3 IHNpemVfdFttZXNzYWdlSW5mby5hdHRhY2htZW50Q291bnQoKV07CisgICAgICAgICAgICBtZW1j cHkoYXR0YWNobWVudFNpemVzLCBtZXNzYWdlRGF0YSwgbWVzc2FnZUluZm8uYXR0YWNobWVudENv dW50KCkgKiBzaXplb2Yoc2l6ZV90KSk7CiAKLSAgICAgICAgICAgIG1lc3NhZ2VEYXRhICs9IHNp emVvZihhdHRhY2htZW50U2l6ZXMpOworICAgICAgICAgICAgbWVzc2FnZURhdGEgKz0gbWVzc2Fn ZUluZm8uYXR0YWNobWVudENvdW50KCkqc2l6ZW9mKHNpemVfdCk7CiAKLSAgICAgICAgICAgIGlu dCBmaWxlRGVzY3JpcHRvcnNbbWVzc2FnZUluZm8uYXR0YWNobWVudENvdW50KCldOwotICAgICAg ICAgICAgbWVtY3B5KGZpbGVEZXNjcmlwdG9ycywgQ01TR19EQVRBKGNvbnRyb2xNZXNzYWdlKSwg c2l6ZW9mKGZpbGVEZXNjcmlwdG9ycykpOworICAgICAgICAgICAgaW50KiBmaWxlRGVzY3JpcHRv cnMgPSBuZXcgaW50W21lc3NhZ2VJbmZvLmF0dGFjaG1lbnRDb3VudCgpXTsKKyAgICAgICAgICAg IG1lbWNweShmaWxlRGVzY3JpcHRvcnMsIENNU0dfREFUQShjb250cm9sTWVzc2FnZSksIG1lc3Nh Z2VJbmZvLmF0dGFjaG1lbnRDb3VudCgpICogc2l6ZW9mKGludCkpOwogCiAgICAgICAgICAgICBp bnQgYXR0YWNobWVudENvdW50ID0gbWVzc2FnZUluZm8uYXR0YWNobWVudENvdW50KCk7CiAKQEAg LTIyNyw2ICsyMjcsOSBAQCB2b2lkIENvbm5lY3Rpb246OnJlYWR5UmVhZEhhbmRsZXIoKQogICAg ICAgICAgICAgfQogCiAgICAgICAgICAgICBjb250cm9sTWVzc2FnZSA9IENNU0dfTlhUSERSKCZt ZXNzYWdlLCBjb250cm9sTWVzc2FnZSk7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGRlbGV0 ZVtdIGZpbGVEZXNjcmlwdG9yczsKKyAgICAgICAgICAgIGRlbGV0ZVtdIGF0dGFjaG1lbnRTaXpl czsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwog ICAgICAgICAgICAgcmV0dXJuOwpAQCAtMzIwLDEyICszMjMsMTIgQEAgYm9vbCBDb25uZWN0aW9u OjpzZW5kT3V0Z29pbmdNZXNzYWdlKE1lc3NhZ2VJRCBtZXNzYWdlSUQsIFBhc3NPd25QdHI8QXJn dW1lbnRFbmMKICAgICBpb3ZbMF0uaW92X2Jhc2UgPSByZWludGVycHJldF9jYXN0PHZvaWQqPigm bWVzc2FnZUluZm8pOwogICAgIGlvdlswXS5pb3ZfbGVuID0gc2l6ZW9mKG1lc3NhZ2VJbmZvKTsK IAotICAgIGNoYXIgYXR0YWNobWVudEZEQnVmZmVyW0NNU0dfU1BBQ0Uoc2l6ZW9mKGludCkgKiAo YXR0YWNobWVudHMuc2l6ZSgpKSldOwotICAgIHNpemVfdCBhdHRhY2htZW50U2l6ZXNbYXR0YWNo bWVudHMuc2l6ZSgpXTsKKyAgICBjaGFyKiBhdHRhY2htZW50RkRCdWZmZXIgPSBuZXcgY2hhcltD TVNHX1NQQUNFKHNpemVvZihpbnQpICogKGF0dGFjaG1lbnRzLnNpemUoKSkpXTsKKyAgICBzaXpl X3QqIGF0dGFjaG1lbnRTaXplcyA9IG5ldyBzaXplX3RbYXR0YWNobWVudHMuc2l6ZSgpXTsKIAog ICAgIGlmICghYXR0YWNobWVudHMuaXNFbXB0eSgpKSB7CiAgICAgICAgIG1lc3NhZ2UubXNnX2Nv bnRyb2wgPSBhdHRhY2htZW50RkRCdWZmZXI7Ci0gICAgICAgIG1lc3NhZ2UubXNnX2NvbnRyb2xs ZW4gPSBzaXplb2YoYXR0YWNobWVudEZEQnVmZmVyKTsKKyAgICAgICAgbWVzc2FnZS5tc2dfY29u dHJvbGxlbiA9IHNpemVvZihjaGFyKSpDTVNHX1NQQUNFKHNpemVvZihpbnQpICogKGF0dGFjaG1l bnRzLnNpemUoKSkpOwogCiAgICAgICAgIHN0cnVjdCBjbXNnaGRyKiBjbXNnID0gQ01TR19GSVJT VEhEUigmbWVzc2FnZSk7CiAgICAgICAgIGNtc2ctPmNtc2dfbGV2ZWwgPSBTT0xfU09DS0VUOwpA QCAtMzQxLDcgKzM0NCw3IEBAIGJvb2wgQ29ubmVjdGlvbjo6c2VuZE91dGdvaW5nTWVzc2FnZShN ZXNzYWdlSUQgbWVzc2FnZUlELCBQYXNzT3duUHRyPEFyZ3VtZW50RW5jCiAgICAgICAgIG1lc3Nh Z2UubXNnX2NvbnRyb2xsZW4gPSBjbXNnLT5jbXNnX2xlbjsKIAogICAgICAgICBpb3ZbaW92TGVu Z3RoXS5pb3ZfYmFzZSA9IGF0dGFjaG1lbnRTaXplczsKLSAgICAgICAgaW92W2lvdkxlbmd0aF0u aW92X2xlbiA9IHNpemVvZihhdHRhY2htZW50U2l6ZXMpOworICAgICAgICBpb3ZbaW92TGVuZ3Ro XS5pb3ZfbGVuID0gc2l6ZW9mKHNpemVfdCkgKiBhdHRhY2htZW50cy5zaXplKCk7CiAgICAgICAg ICsraW92TGVuZ3RoOwogICAgIH0KIApAQCAtMzU4LDYgKzM2MSwxMCBAQCBib29sIENvbm5lY3Rp b246OnNlbmRPdXRnb2luZ01lc3NhZ2UoTWVzc2FnZUlEIG1lc3NhZ2VJRCwgUGFzc093blB0cjxB cmd1bWVudEVuYwogICAgICAgICBpZiAoZXJybm8gIT0gRUlOVFIpCiAgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfQorICAgIAorICAgIGRlbGV0ZVtdIGF0dGFjaG1lbnRGREJ1ZmZlcjsK KyAgICBkZWxldGVbXSBhdHRhY2htZW50U2l6ZXM7CisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NM YXVuY2hlclF0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9j ZXNzTGF1bmNoZXJRdC5jcHAKaW5kZXggY2FlNWJkZi4uNGMzMzFkYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVy UXQuY3BwCkBAIC05NCw3ICs5NCwxMCBAQCB2b2lkIFByb2Nlc3NMYXVuY2hlcjo6bGF1bmNoUHJv Y2VzcygpCiAgICAgfQogCiAgICAgaW50IHNvY2tldHNbMl07Ci0gICAgaWYgKHNvY2tldHBhaXIo QUZfVU5JWCwgU09DS19ER1JBTSwgMCwgc29ja2V0cykgPT0gLTEpIHsKKyNpZiAhT1MoU1lNQklB TikKKyAgICBpZiAoc29ja2V0cGFpcihBRl9VTklYLCBTT0NLX0RHUkFNLCAwLCBzb2NrZXRzKSA9 PSAtMSkgCisjZW5kaWYKKyAgICB7CiAgICAgICAgIHFEZWJ1ZygpIDw8ICJDcmVhdGlvbiBvZiBz b2NrZXQgZmFpbGVkIHdpdGggZXJybm86IiA8PCBlcnJubzsKICAgICAgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CiAgICAgICAgIHJldHVybjsK 88510 2011-04-06 14:11:19 -0700 2011-04-06 16:06:23 -0700 updated patch. 57877_v3.patch text/plain 4618 s.mathur ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3YWIwNDgxLi4zNjE1YjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDQtMDYgIFNpZGRoYXJ0aCBNYXRodXIgIDxzaWRkaGFydGgubWF0aHVyQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdW1dLMl1bU3ltYmlhbl0gUmVtb3ZlIHVzZSBvZiBzdGFjayBhcnJheXMgd2l0aCB2YXJpYWJs ZSBzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 Nzg3NworICAgICAgICAKKyAgICAgICAgRm9yIGJldHRlciBjb21waWxlciBwb3J0YWJpbGl0eSwg dXNlIG5ldy9kZWxldGUgZm9yIGFycmF5cyB3aGVuIHNpemUKKyAgICAgICAgaXNuJ3Qga25vd24g YXQgY29tcGlsZSB0aW1lLiBBbHNvIGZpeCBvbmUgY29tcGlsZXIgd2FybmluZyBhYm91dCBiaXRz aGlmdAorICAgICAgICBvcGVyYXRpb25zIG9uIHNpZ25lZCBpbnRlZ2Vycy4gCisgICAgICAgICog UGxhdGZvcm0vQ29yZUlQQy9xdC9Db25uZWN0aW9uUXQuY3BwOiAKKyAgICAgICAgKENvcmVJUEM6 OkNvbm5lY3Rpb246OnJlYWR5UmVhZEhhbmRsZXIpOiAKKyAgICAgICAgKENvcmVJUEM6OkNvbm5l Y3Rpb246OnNlbmRPdXRnb2luZ01lc3NhZ2UpOgorCiAyMDExLTA0LTA2ICBCcmFkeSBFaWRzb24g IDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNz b24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3F0L0Nvbm5l Y3Rpb25RdC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3F0L0Nvbm5lY3Rp b25RdC5jcHAKaW5kZXggMjI1ZDdkYy4uM2QwZDNmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvUGxhdGZvcm0vQ29yZUlQQy9xdC9Db25uZWN0aW9uUXQuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1BsYXRmb3JtL0NvcmVJUEMvcXQvQ29ubmVjdGlvblF0LmNwcApAQCAtNDgsNyArNDgsNyBA QCBzdGF0aWMgY29uc3Qgc2l6ZV90IG1lc3NhZ2VNYXhTaXplID0gNDA5NjsKIHN0YXRpYyBjb25z dCBzaXplX3QgYXR0YWNobWVudE1heEFtb3VudCA9IDI1NTsKIAogZW51bSB7Ci0gICAgTWVzc2Fn ZUJvZHlJc09PTCA9IDEgPDwgMzEKKyAgICBNZXNzYWdlQm9keUlzT09MID0gMVUgPDwgMzEKIH07 CiAKIGNsYXNzIE1lc3NhZ2VJbmZvIHsKQEAgLTE0NywxNCArMTQ3LDE0IEBAIHZvaWQgQ29ubmVj dGlvbjo6cmVhZHlSZWFkSGFuZGxlcigpCiAgICAgU29ja2V0Tm90aWZpZXJSZXNvdXJjZUd1YXJk IHNvY2tldE5vdGlmaWVyRW5hYmxlcihtX3NvY2tldE5vdGlmaWVyKTsKICAgICBBdHRhY2htZW50 UmVzb3VyY2VHdWFyZDxEZXF1ZTxBdHRhY2htZW50PiwgRGVxdWU8QXR0YWNobWVudD46Oml0ZXJh dG9yPiBhdHRhY2hlbWVudERpc3Bvc2VyKGF0dGFjaG1lbnRzKTsKIAotICAgIGNoYXIgYXR0YWNo bWVudERlc2NyaXB0b3JCdWZmZXJbQ01TR19TUEFDRShzaXplb2YoaW50KSAqIChhdHRhY2htZW50 TWF4QW1vdW50KSldOworICAgIE93bkFycmF5UHRyPGNoYXI+IGF0dGFjaG1lbnREZXNjcmlwdG9y QnVmZmVyID0gYWRvcHRBcnJheVB0cihuZXcgY2hhcltDTVNHX1NQQUNFKHNpemVvZihpbnQpICog KGF0dGFjaG1lbnRNYXhBbW91bnQpKV0pOwogICAgIHN0cnVjdCBtc2doZHIgbWVzc2FnZTsKICAg ICBtZW1zZXQoJm1lc3NhZ2UsIDAsIHNpemVvZihtZXNzYWdlKSk7CiAKICAgICBzdHJ1Y3QgaW92 ZWMgaW92WzFdOwogICAgIG1lbXNldCgmaW92LCAwLCBzaXplb2YoaW92KSk7CiAKLSAgICBtZXNz YWdlLm1zZ19jb250cm9sID0gYXR0YWNobWVudERlc2NyaXB0b3JCdWZmZXI7CisgICAgbWVzc2Fn ZS5tc2dfY29udHJvbCA9IGF0dGFjaG1lbnREZXNjcmlwdG9yQnVmZmVyLmdldCgpOwogICAgIG1l c3NhZ2UubXNnX2NvbnRyb2xsZW4gPSBDTVNHX1NQQUNFKHNpemVvZihpbnQpICogKGF0dGFjaG1l bnRNYXhBbW91bnQpKTsKIAogICAgIGlvdlswXS5pb3ZfYmFzZSA9IG1fcmVhZEJ1ZmZlci5kYXRh KCk7CkBAIC0xODQsMTMgKzE4NCwxMyBAQCB2b2lkIENvbm5lY3Rpb246OnJlYWR5UmVhZEhhbmRs ZXIoKQogCiAgICAgaWYgKG1lc3NhZ2VJbmZvLmF0dGFjaG1lbnRDb3VudCgpKSB7CiAgICAgICAg IGlmIChjb250cm9sTWVzc2FnZSAmJiBjb250cm9sTWVzc2FnZS0+Y21zZ19sZXZlbCA9PSBTT0xf U09DS0VUICYmIGNvbnRyb2xNZXNzYWdlLT5jbXNnX3R5cGUgPT0gU0NNX1JJR0hUUykgewotICAg ICAgICAgICAgc2l6ZV90IGF0dGFjaG1lbnRTaXplc1ttZXNzYWdlSW5mby5hdHRhY2htZW50Q291 bnQoKV07Ci0gICAgICAgICAgICBtZW1jcHkoYXR0YWNobWVudFNpemVzLCBtZXNzYWdlRGF0YSwg c2l6ZW9mKGF0dGFjaG1lbnRTaXplcykpOworICAgICAgICAgICAgT3duQXJyYXlQdHI8c2l6ZV90 PiBhdHRhY2htZW50U2l6ZXMgPSBhZG9wdEFycmF5UHRyKG5ldyBzaXplX3RbbWVzc2FnZUluZm8u YXR0YWNobWVudENvdW50KCldKTsKKyAgICAgICAgICAgIG1lbWNweShhdHRhY2htZW50U2l6ZXMu Z2V0KCksIG1lc3NhZ2VEYXRhLCBzaXplb2Yoc2l6ZV90KSAqIG1lc3NhZ2VJbmZvLmF0dGFjaG1l bnRDb3VudCgpKTsKIAogICAgICAgICAgICAgbWVzc2FnZURhdGEgKz0gc2l6ZW9mKGF0dGFjaG1l bnRTaXplcyk7CiAKLSAgICAgICAgICAgIGludCBmaWxlRGVzY3JpcHRvcnNbbWVzc2FnZUluZm8u YXR0YWNobWVudENvdW50KCldOwotICAgICAgICAgICAgbWVtY3B5KGZpbGVEZXNjcmlwdG9ycywg Q01TR19EQVRBKGNvbnRyb2xNZXNzYWdlKSwgc2l6ZW9mKGZpbGVEZXNjcmlwdG9ycykpOworICAg ICAgICAgICAgT3duQXJyYXlQdHI8aW50PiBmaWxlRGVzY3JpcHRvcnMgPSBhZG9wdEFycmF5UHRy KG5ldyBpbnRbbWVzc2FnZUluZm8uYXR0YWNobWVudENvdW50KCldKTsKKyAgICAgICAgICAgIG1l bWNweShmaWxlRGVzY3JpcHRvcnMuZ2V0KCksIENNU0dfREFUQShjb250cm9sTWVzc2FnZSksIHNp emVvZihpbnQpICogbWVzc2FnZUluZm8uYXR0YWNobWVudENvdW50KCkpOwogCiAgICAgICAgICAg ICBpbnQgYXR0YWNobWVudENvdW50ID0gbWVzc2FnZUluZm8uYXR0YWNobWVudENvdW50KCk7CiAK QEAgLTMyMCwxMiArMzIwLDEyIEBAIGJvb2wgQ29ubmVjdGlvbjo6c2VuZE91dGdvaW5nTWVzc2Fn ZShNZXNzYWdlSUQgbWVzc2FnZUlELCBQYXNzT3duUHRyPEFyZ3VtZW50RW5jCiAgICAgaW92WzBd Lmlvdl9iYXNlID0gcmVpbnRlcnByZXRfY2FzdDx2b2lkKj4oJm1lc3NhZ2VJbmZvKTsKICAgICBp b3ZbMF0uaW92X2xlbiA9IHNpemVvZihtZXNzYWdlSW5mbyk7CiAKLSAgICBjaGFyIGF0dGFjaG1l bnRGREJ1ZmZlcltDTVNHX1NQQUNFKHNpemVvZihpbnQpICogKGF0dGFjaG1lbnRzLnNpemUoKSkp XTsKLSAgICBzaXplX3QgYXR0YWNobWVudFNpemVzW2F0dGFjaG1lbnRzLnNpemUoKV07CisgICAg T3duQXJyYXlQdHI8Y2hhcj4gYXR0YWNobWVudEZEQnVmZmVyID0gYWRvcHRBcnJheVB0cihuZXcg Y2hhcltDTVNHX1NQQUNFKHNpemVvZihpbnQpICogYXR0YWNobWVudHMuc2l6ZSgpKV0pOworICAg IE93bkFycmF5UHRyPHNpemVfdD4gYXR0YWNobWVudFNpemVzID0gYWRvcHRBcnJheVB0cihuZXcg c2l6ZV90W2F0dGFjaG1lbnRzLnNpemUoKV0pOwogCiAgICAgaWYgKCFhdHRhY2htZW50cy5pc0Vt cHR5KCkpIHsKLSAgICAgICAgbWVzc2FnZS5tc2dfY29udHJvbCA9IGF0dGFjaG1lbnRGREJ1ZmZl cjsKLSAgICAgICAgbWVzc2FnZS5tc2dfY29udHJvbGxlbiA9IHNpemVvZihhdHRhY2htZW50RkRC dWZmZXIpOworICAgICAgICBtZXNzYWdlLm1zZ19jb250cm9sID0gYXR0YWNobWVudEZEQnVmZmVy LmdldCgpOworICAgICAgICBtZXNzYWdlLm1zZ19jb250cm9sbGVuID0gc2l6ZW9mKGNoYXIpICog Q01TR19TUEFDRShzaXplb2YoaW50KSAqIGF0dGFjaG1lbnRzLnNpemUoKSk7CiAKICAgICAgICAg c3RydWN0IGNtc2doZHIqIGNtc2cgPSBDTVNHX0ZJUlNUSERSKCZtZXNzYWdlKTsKICAgICAgICAg Y21zZy0+Y21zZ19sZXZlbCA9IFNPTF9TT0NLRVQ7CkBAIC0zNDAsOCArMzQwLDggQEAgYm9vbCBD b25uZWN0aW9uOjpzZW5kT3V0Z29pbmdNZXNzYWdlKE1lc3NhZ2VJRCBtZXNzYWdlSUQsIFBhc3NP d25QdHI8QXJndW1lbnRFbmMKIAogICAgICAgICBtZXNzYWdlLm1zZ19jb250cm9sbGVuID0gY21z Zy0+Y21zZ19sZW47CiAKLSAgICAgICAgaW92W2lvdkxlbmd0aF0uaW92X2Jhc2UgPSBhdHRhY2ht ZW50U2l6ZXM7Ci0gICAgICAgIGlvdltpb3ZMZW5ndGhdLmlvdl9sZW4gPSBzaXplb2YoYXR0YWNo bWVudFNpemVzKTsKKyAgICAgICAgaW92W2lvdkxlbmd0aF0uaW92X2Jhc2UgPSBhdHRhY2htZW50 U2l6ZXMuZ2V0KCk7CisgICAgICAgIGlvdltpb3ZMZW5ndGhdLmlvdl9sZW4gPSBzaXplb2Yoc2l6 ZV90KSAqIGF0dGFjaG1lbnRzLnNpemUoKTsKICAgICAgICAgKytpb3ZMZW5ndGg7CiAgICAgfQog Cg== 88647 2011-04-07 08:48:34 -0700 2011-04-07 09:05:18 -0700 Patch to fix Symbian Wk2 build until pure Symbian IPC and process launching is done 57877_socketpair.patch text/plain 1377 s.mathur ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwZTRmMDIxLi4yYWJiY2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDQtMDcgIFNpZGRoYXJ0aCBNYXRodXIgIDxzaWRkaGFydGgubWF0aHVyQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdW1dLMl1bU3ltYmlhbl0gVGVtcG9yYXJ5IGJ1aWxkIGZpeCB1bnRpbCBuYXRpdmUgU3ltYmlh biBJUEMgaXMgZG9uZS4gSW1wbGVtZW50IGZha2Ugc29ja2V0cGFpcigpIGFzIGl0J3Mgbm90IGF2 YWlsYWJsZS4gCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01Nzg3NworCisgICAgICAgICogVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hl clF0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6c29ja2V0cGFpcik6IHNvY2tldHBhaXIoKSB3aGlj aCByZXR1cm5zIC0xCisKIDIwMTEtMDQtMDcgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5j cHAKaW5kZXggY2FlNWJkZi4uZGYwOWVmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwCkBAIC04Myw2 ICs4MywxNiBAQCB2b2lkIFF0V2ViUHJvY2Vzczo6c2V0dXBDaGlsZFByb2Nlc3MoKQogI2VuZGlm CiB9CiAKKyNpZiBPUyhTWU1CSUFOKQorLy8gU3ltYmlhbidzIFBPU0lYIGxheWVyIGRvZXNuJ3Qg aGF2ZSBhIHNvY2tldHBhaXIoKSwgc28KKy8vIHRoZSBmb2xsb3dpbmcgaXMganVzdCB0byBmaXgg dGhlIGJ1aWxkIHVudGlsIGEgcHVyZSBTeW1iaWFuCisvLyBJUEMgaW1wbGVtZW50YXRpb24gbGFu ZHMuCitzdGF0aWMgaW50IHNvY2tldHBhaXIoaW50LCBpbnQsIGludCAsIGludFsyXSkKK3sKKyAg ICByZXR1cm4gLTE7Cit9CisjZW5kaWYKKwogdm9pZCBQcm9jZXNzTGF1bmNoZXI6OmxhdW5jaFBy b2Nlc3MoKQogewogICAgIFFTdHJpbmcgYXBwbGljYXRpb25QYXRoID0gUUxhdGluMVN0cmluZygi JTEgJTIiKTsK 88649 2011-04-07 09:05:18 -0700 2011-04-07 09:42:10 -0700 Minor comment improvement (added "FIXME") 57877_socketpair_v2.patch text/plain 1392 s.mathur ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwZTRmMDIxLi4yYWJiY2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMg QEAKKzIwMTEtMDQtMDcgIFNpZGRoYXJ0aCBNYXRodXIgIDxzaWRkaGFydGgubWF0aHVyQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdW1dLMl1bU3ltYmlhbl0gVGVtcG9yYXJ5IGJ1aWxkIGZpeCB1bnRpbCBuYXRpdmUgU3ltYmlh biBJUEMgaXMgZG9uZS4gSW1wbGVtZW50IGZha2Ugc29ja2V0cGFpcigpIGFzIGl0J3Mgbm90IGF2 YWlsYWJsZS4gCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01Nzg3NworCisgICAgICAgICogVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hl clF0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6c29ja2V0cGFpcik6IHNvY2tldHBhaXIoKSB3aGlj aCByZXR1cm5zIC0xCisKIDIwMTEtMDQtMDcgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9xdC9Qcm9jZXNzTGF1bmNoZXJRdC5j cHAKaW5kZXggY2FlNWJkZi4uNWYzYzk5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0xhdW5jaGVyL3F0L1Byb2Nlc3NMYXVuY2hlclF0LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvcXQvUHJvY2Vzc0xhdW5jaGVyUXQuY3BwCkBAIC04Myw2 ICs4MywxNiBAQCB2b2lkIFF0V2ViUHJvY2Vzczo6c2V0dXBDaGlsZFByb2Nlc3MoKQogI2VuZGlm CiB9CiAKKyNpZiBPUyhTWU1CSUFOKQorLy8gRklYTUU6IFN5bWJpYW4ncyBQT1NJWCBsYXllciBk b2Vzbid0IGhhdmUgYSBzb2NrZXRwYWlyKCksIHNvCisvLyB0aGUgZm9sbG93aW5nIGlzIGp1c3Qg dG8gZml4IHRoZSBidWlsZCB1bnRpbCBhIHB1cmUgU3ltYmlhbgorLy8gSVBDIGltcGxlbWVudGF0 aW9uIGxhbmRzIG9uIHRydW5rCitzdGF0aWMgaW50IHNvY2tldHBhaXIoaW50LCBpbnQsIGludCAs IGludFsyXSkKK3sKKyAgICByZXR1cm4gLTE7Cit9CisjZW5kaWYKKwogdm9pZCBQcm9jZXNzTGF1 bmNoZXI6OmxhdW5jaFByb2Nlc3MoKQogewogICAgIFFTdHJpbmcgYXBwbGljYXRpb25QYXRoID0g UUxhdGluMVN0cmluZygiJTEgJTIiKTsK 88834 2011-04-08 10:00:05 -0700 2011-04-08 12:30:33 -0700 Rapply patch after r83215 57877_v4.patch text/plain 4614 s.mathur ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5MjkyNTk2Li43MDIwYTJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDQtMDggIFNpZGRoYXJ0aCBNYXRodXIgIDxzaWRkaGFydGgubWF0aHVyQG5va2lh LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdW1dLMl1bU3ltYmlhbl0gUmVtb3ZlIHVzZSBvZiBzdGFjayBhcnJheXMgd2l0aCB2YXJpYWJs ZSBzaXplCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 Nzg3NworCisgICAgICAgIEZvciBiZXR0ZXIgY29tcGlsZXIgcG9ydGFiaWxpdHksIHVzZSBuZXcv ZGVsZXRlIGZvciBhcnJheXMgd2hlbiBzaXplCisgICAgICAgIGlzbid0IGtub3duIGF0IGNvbXBp bGUgdGltZS4gQWxzbyBmaXggb25lIGNvbXBpbGVyIHdhcm5pbmcgYWJvdXQgYml0c2hpZnQKKyAg ICAgICAgb3BlcmF0aW9ucyBvbiBzaWduZWQgaW50ZWdlcgorICAgICAgICAqIFBsYXRmb3JtL0Nv cmVJUEMvdW5peC9Db25uZWN0aW9uVW5peC5jcHA6CisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0 aW9uOjpyZWFkeVJlYWRIYW5kbGVyKToKKyAgICAgICAgKENvcmVJUEM6OkNvbm5lY3Rpb246OnNl bmRPdXRnb2luZ01lc3NhZ2UpOgorCiAyMDExLTA0LTA3ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFw cGxlLmNvbT4KIAogICAgICAgICBQYXNzIE5QUF9TZXRXaW5kb3cgYSBudWxsIHdpbmRvdyBoYW5k bGUgZHVyaW5nIHBsdWdpbiBkZXN0cnVjdGlvbiBvbiBub24tTWFjIHBsYXRmb3JtcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy91bml4L0Nvbm5lY3Rpb25Vbml4 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvdW5peC9Db25uZWN0aW9uVW5p eC5jcHAKaW5kZXggM2ZjNDQxMi4uOTJmZmZmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv UGxhdGZvcm0vQ29yZUlQQy91bml4L0Nvbm5lY3Rpb25Vbml4LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3VuaXgvQ29ubmVjdGlvblVuaXguY3BwCkBAIC01Myw3ICs1 Myw3IEBAIHN0YXRpYyBjb25zdCBzaXplX3QgbWVzc2FnZU1heFNpemUgPSA0MDk2Owogc3RhdGlj IGNvbnN0IHNpemVfdCBhdHRhY2htZW50TWF4QW1vdW50ID0gMjU1OwogCiBlbnVtIHsKLSAgICBN ZXNzYWdlQm9keUlzT09MID0gMSA8PCAzMQorICAgIE1lc3NhZ2VCb2R5SXNPT0wgPSAxVSA8PCAz MQogfTsKIAogY2xhc3MgTWVzc2FnZUluZm8gewpAQCAtMTY2LDE0ICsxNjYsMTQgQEAgdm9pZCBD b25uZWN0aW9uOjpyZWFkeVJlYWRIYW5kbGVyKCkKICNlbmRpZgogICAgIEF0dGFjaG1lbnRSZXNv dXJjZUd1YXJkPERlcXVlPEF0dGFjaG1lbnQ+LCBEZXF1ZTxBdHRhY2htZW50Pjo6aXRlcmF0b3I+ IGF0dGFjaGVtZW50RGlzcG9zZXIoYXR0YWNobWVudHMpOwogCi0gICAgY2hhciBhdHRhY2htZW50 RGVzY3JpcHRvckJ1ZmZlcltDTVNHX1NQQUNFKHNpemVvZihpbnQpICogKGF0dGFjaG1lbnRNYXhB bW91bnQpKV07CisgICAgT3duQXJyYXlQdHI8Y2hhcj4gYXR0YWNobWVudERlc2NyaXB0b3JCdWZm ZXIgPSBhZG9wdEFycmF5UHRyKG5ldyBjaGFyW0NNU0dfU1BBQ0Uoc2l6ZW9mKGludCkgKiAoYXR0 YWNobWVudE1heEFtb3VudCkpXSk7CiAgICAgc3RydWN0IG1zZ2hkciBtZXNzYWdlOwogICAgIG1l bXNldCgmbWVzc2FnZSwgMCwgc2l6ZW9mKG1lc3NhZ2UpKTsKIAogICAgIHN0cnVjdCBpb3ZlYyBp b3ZbMV07CiAgICAgbWVtc2V0KCZpb3YsIDAsIHNpemVvZihpb3YpKTsKIAotICAgIG1lc3NhZ2Uu bXNnX2NvbnRyb2wgPSBhdHRhY2htZW50RGVzY3JpcHRvckJ1ZmZlcjsKKyAgICBtZXNzYWdlLm1z Z19jb250cm9sID0gYXR0YWNobWVudERlc2NyaXB0b3JCdWZmZXIuZ2V0KCk7CiAgICAgbWVzc2Fn ZS5tc2dfY29udHJvbGxlbiA9IENNU0dfU1BBQ0Uoc2l6ZW9mKGludCkgKiAoYXR0YWNobWVudE1h eEFtb3VudCkpOwogCiAgICAgaW92WzBdLmlvdl9iYXNlID0gbV9yZWFkQnVmZmVyLmRhdGEoKTsK QEAgLTIwMywxMyArMjAzLDEzIEBAIHZvaWQgQ29ubmVjdGlvbjo6cmVhZHlSZWFkSGFuZGxlcigp CiAKICAgICBpZiAobWVzc2FnZUluZm8uYXR0YWNobWVudENvdW50KCkpIHsKICAgICAgICAgaWYg KGNvbnRyb2xNZXNzYWdlICYmIGNvbnRyb2xNZXNzYWdlLT5jbXNnX2xldmVsID09IFNPTF9TT0NL RVQgJiYgY29udHJvbE1lc3NhZ2UtPmNtc2dfdHlwZSA9PSBTQ01fUklHSFRTKSB7Ci0gICAgICAg ICAgICBzaXplX3QgYXR0YWNobWVudFNpemVzW21lc3NhZ2VJbmZvLmF0dGFjaG1lbnRDb3VudCgp XTsKLSAgICAgICAgICAgIG1lbWNweShhdHRhY2htZW50U2l6ZXMsIG1lc3NhZ2VEYXRhLCBzaXpl b2YoYXR0YWNobWVudFNpemVzKSk7CisgICAgICAgICAgICBPd25BcnJheVB0cjxzaXplX3Q+IGF0 dGFjaG1lbnRTaXplcyA9IGFkb3B0QXJyYXlQdHIobmV3IHNpemVfdFttZXNzYWdlSW5mby5hdHRh Y2htZW50Q291bnQoKV0pOworICAgICAgICAgICAgbWVtY3B5KGF0dGFjaG1lbnRTaXplcy5nZXQo KSwgbWVzc2FnZURhdGEsIHNpemVvZihzaXplX3QpICogbWVzc2FnZUluZm8uYXR0YWNobWVudENv dW50KCkpOwogCiAgICAgICAgICAgICBtZXNzYWdlRGF0YSArPSBzaXplb2YoYXR0YWNobWVudFNp emVzKTsKIAotICAgICAgICAgICAgaW50IGZpbGVEZXNjcmlwdG9yc1ttZXNzYWdlSW5mby5hdHRh Y2htZW50Q291bnQoKV07Ci0gICAgICAgICAgICBtZW1jcHkoZmlsZURlc2NyaXB0b3JzLCBDTVNH X0RBVEEoY29udHJvbE1lc3NhZ2UpLCBzaXplb2YoZmlsZURlc2NyaXB0b3JzKSk7CisgICAgICAg ICAgICBPd25BcnJheVB0cjxpbnQ+IGZpbGVEZXNjcmlwdG9ycyA9IGFkb3B0QXJyYXlQdHIobmV3 IGludFttZXNzYWdlSW5mby5hdHRhY2htZW50Q291bnQoKV0pOworICAgICAgICAgICAgbWVtY3B5 KGZpbGVEZXNjcmlwdG9ycy5nZXQoKSwgQ01TR19EQVRBKGNvbnRyb2xNZXNzYWdlKSwgc2l6ZW9m KGludCkgKiBtZXNzYWdlSW5mby5hdHRhY2htZW50Q291bnQoKSk7CiAKICAgICAgICAgICAgIGlu dCBhdHRhY2htZW50Q291bnQgPSBtZXNzYWdlSW5mby5hdHRhY2htZW50Q291bnQoKTsKIApAQCAt MzUwLDEyICszNTAsMTIgQEAgYm9vbCBDb25uZWN0aW9uOjpzZW5kT3V0Z29pbmdNZXNzYWdlKE1l c3NhZ2VJRCBtZXNzYWdlSUQsIFBhc3NPd25QdHI8QXJndW1lbnRFbmMKICAgICBpb3ZbMF0uaW92 X2Jhc2UgPSByZWludGVycHJldF9jYXN0PHZvaWQqPigmbWVzc2FnZUluZm8pOwogICAgIGlvdlsw XS5pb3ZfbGVuID0gc2l6ZW9mKG1lc3NhZ2VJbmZvKTsKIAotICAgIGNoYXIgYXR0YWNobWVudEZE QnVmZmVyW0NNU0dfU1BBQ0Uoc2l6ZW9mKGludCkgKiAoYXR0YWNobWVudHMuc2l6ZSgpKSldOwot ICAgIHNpemVfdCBhdHRhY2htZW50U2l6ZXNbYXR0YWNobWVudHMuc2l6ZSgpXTsKKyAgICBPd25B cnJheVB0cjxjaGFyPiBhdHRhY2htZW50RkRCdWZmZXIgPSBhZG9wdEFycmF5UHRyKG5ldyBjaGFy W0NNU0dfU1BBQ0Uoc2l6ZW9mKGludCkgKiBhdHRhY2htZW50cy5zaXplKCkpXSk7CisgICAgT3du QXJyYXlQdHI8c2l6ZV90PiBhdHRhY2htZW50U2l6ZXMgPSBhZG9wdEFycmF5UHRyKG5ldyBzaXpl X3RbYXR0YWNobWVudHMuc2l6ZSgpXSk7CiAKICAgICBpZiAoIWF0dGFjaG1lbnRzLmlzRW1wdHko KSkgewotICAgICAgICBtZXNzYWdlLm1zZ19jb250cm9sID0gYXR0YWNobWVudEZEQnVmZmVyOwot ICAgICAgICBtZXNzYWdlLm1zZ19jb250cm9sbGVuID0gc2l6ZW9mKGF0dGFjaG1lbnRGREJ1ZmZl cik7CisgICAgICAgIG1lc3NhZ2UubXNnX2NvbnRyb2wgPSBhdHRhY2htZW50RkRCdWZmZXIuZ2V0 KCk7CisgICAgICAgIG1lc3NhZ2UubXNnX2NvbnRyb2xsZW4gPSBzaXplb2YoY2hhcikgKiBDTVNH X1NQQUNFKHNpemVvZihpbnQpICogYXR0YWNobWVudHMuc2l6ZSgpKTsKIAogICAgICAgICBzdHJ1 Y3QgY21zZ2hkciogY21zZyA9IENNU0dfRklSU1RIRFIoJm1lc3NhZ2UpOwogICAgICAgICBjbXNn LT5jbXNnX2xldmVsID0gU09MX1NPQ0tFVDsKQEAgLTM3MCw4ICszNzAsOCBAQCBib29sIENvbm5l Y3Rpb246OnNlbmRPdXRnb2luZ01lc3NhZ2UoTWVzc2FnZUlEIG1lc3NhZ2VJRCwgUGFzc093blB0 cjxBcmd1bWVudEVuYwogCiAgICAgICAgIG1lc3NhZ2UubXNnX2NvbnRyb2xsZW4gPSBjbXNnLT5j bXNnX2xlbjsKIAotICAgICAgICBpb3ZbaW92TGVuZ3RoXS5pb3ZfYmFzZSA9IGF0dGFjaG1lbnRT aXplczsKLSAgICAgICAgaW92W2lvdkxlbmd0aF0uaW92X2xlbiA9IHNpemVvZihhdHRhY2htZW50 U2l6ZXMpOworICAgICAgICBpb3ZbaW92TGVuZ3RoXS5pb3ZfYmFzZSA9IGF0dGFjaG1lbnRTaXpl cy5nZXQoKTsKKyAgICAgICAgaW92W2lvdkxlbmd0aF0uaW92X2xlbiA9IHNpemVvZihzaXplX3Qp ICogYXR0YWNobWVudHMuc2l6ZSgpOwogICAgICAgICArK2lvdkxlbmd0aDsKICAgICB9CiAK