85537 2012-05-03 13:06:26 -0700 Histogram total allocated bytes in the arena in addition to the render tree size 2012-05-31 06:24:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 87967 1 ojan ojan eric hyatt webkit.review.bot oldest_to_newest 615532 0 ojan 2012-05-03 13:06:26 -0700 Histogram total allocated bytes in the arena in addition to the render tree size 615538 1 140078 ojan 2012-05-03 13:10:04 -0700 Created attachment 140078 Patch 615541 2 ojan 2012-05-03 13:12:25 -0700 I'm a bit torn on making the bytesAllocated an out-param instead of just adding a new method to Page. It avoids some code duplication. In theory it's also faster because we only walk the frame-tree once, but I doubt that matters in practice. Happy to change it if you think a separate method would be cleaner. 615545 3 140078 eric 2012-05-03 13:19:53 -0700 Comment on attachment 140078 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140078&action=review > Source/WebCore/page/Page.h:121 > - size_t renderTreeSize() const; > + size_t renderTreeSize(size_t& totalRenderArenaAllocatedBytes) const; You could alternatively return a simple struct? 615547 4 ojan 2012-05-03 13:23:00 -0700 (In reply to comment #3) > (From update of attachment 140078 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=140078&action=review > > > Source/WebCore/page/Page.h:121 > > - size_t renderTreeSize() const; > > + size_t renderTreeSize(size_t& totalRenderArenaAllocatedBytes) const; > > You could alternatively return a simple struct? That's probably cleaner. Will fix. 615570 5 140078 buildbot 2012-05-03 13:42:22 -0700 Comment on attachment 140078 Patch Attachment 140078 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/12611316 615692 6 140109 ojan 2012-05-03 15:22:18 -0700 Created attachment 140109 Patch 615721 7 140109 buildbot 2012-05-03 15:47:36 -0700 Comment on attachment 140109 Patch Attachment 140109 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/12620250 615728 8 140109 buildbot 2012-05-03 15:50:27 -0700 Comment on attachment 140109 Patch Attachment 140109 did not pass win-ews (win): Output: http://queues.webkit.org/results/12612399 615742 9 140109 webkit-ews 2012-05-03 16:03:18 -0700 Comment on attachment 140109 Patch Attachment 140109 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12514238 615746 10 140118 ojan 2012-05-03 16:08:20 -0700 Created attachment 140118 Patch 615786 11 ojan 2012-05-03 16:41:56 -0700 OK. All the bots are happily compiling now. Eric, squeak! 615803 12 140118 eric 2012-05-03 17:10:01 -0700 Comment on attachment 140118 Patch Works for me. 615873 13 140118 webkit.review.bot 2012-05-03 18:34:58 -0700 Comment on attachment 140118 Patch Clearing flags on attachment: 140118 Committed r116058: <http://trac.webkit.org/changeset/116058> 615874 14 webkit.review.bot 2012-05-03 18:35:04 -0700 All reviewed patches have been landed. Closing bug. 140078 2012-05-03 13:10:04 -0700 2012-05-03 15:22:14 -0700 Patch bug-85537-20120503131003.patch text/plain 8892 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMxNWFjMTk1YWVlODdk ZGYxMzJiOTQ2Mzg1NmFhYjBhNzA4YmUyYS4uMmFlMDQxMDk2ODYwOTc0ODBkODYzMDYwY2I5Mzli ODA3NmU0MTJiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA1LTAzICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSGlzdG9ncmFtIHRvdGFsIGFs bG9jYXRlZCBieXRlcyBpbiB0aGUgYXJlbmEgaW4gYWRkaXRpb24gdG8gdGhlIHJlbmRlciB0cmVl IHNpemUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1 NTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ug b25seSBmcmVlIGJ5dGVzIGFsbG9jYXRlZCB0byBhIFJlbmRlckFyZW5hIHdoZW4gZGVzdHJveWlu ZyB0aGUgRG9jdW1lbnQuCisgICAgICAgIEhpc3RvZ3JhbSBib3RoIHRoZSByZW5kZXIgdHJlZSBz aXplIGFuZCB0aGUgdG90YWwgYnl0ZXMgYWxsb2NhdGVkLiBUaGlzCisgICAgICAgIGdpdmVzIGEg YmV0dGVyIHNlbnNlIG9mIHRoZSBvdmVyaGVhZCBvZiBSZW5kZXJBcmVuYSBhcyB3ZWxsIGFzIGdp dmluZyBhIG1vcmUKKyAgICAgICAgYWNjdXJhdGUgbnVtYmVyIGZvciB0aGUgYW1vdW50IG9mIGFj dHVhbCBtZW1vcnkgdXNlZCBieSB0aGUgcmVuZGVyIHRyZWUuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLiBUaGlzIGlzIG5vdCB3ZWJmYWNpbmcsIHNvIHRoaXMgY2FuJ3QgYmUgdGVzdGVkIHdpdGhv dXQgYWRkaW5nCisgICAgICAgIEFQSSB0byBsYXlvdXQgdGVzdCBjb250cm9sbGVyLCB3aGljaCBk b2Vzbid0IHNlZW0gd29ydGggaXQgZm9yIHRoaXMgY29kZS4KKworICAgICAgICAqIHBhZ2UvUGFn ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpyZW5kZXJUcmVlU2l6ZSk6CisgICAgICAg IChXZWJDb3JlOjpQYWdlOjpzZXRWaXNpYmlsaXR5U3RhdGUpOgorICAgICAgICAqIHBhZ2UvUGFn ZS5oOgorICAgICAgICAoUGFnZSk6CisgICAgICAgICogcGxhdGZvcm0vQXJlbmEuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QXJlbmFBbGxvY2F0ZSk6CisgICAgICAgICogcGxhdGZvcm0vQXJlbmEu aDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJBcmVuYS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJBcmVuYTo6YWxsb2NhdGUpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJBcmVuYS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQXJlbmE6 OnRvdGFsUmVuZGVyQXJlbmFBbGxvY2F0ZWRCeXRlcyk6CisgICAgICAgIChSZW5kZXJBcmVuYSk6 CisKIDIwMTItMDUtMDMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgUmVtb3ZlIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGlkU3RhcnRBY2NlbGVyYXRl ZEFuaW1hdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODE4MmJiNzJkMjcyYThjMDJkNjkxOGYyNzczMGYz ZWNmNTliOTk3ZS4uYjc3ZTFhYjM5M2Q5MTI1ZjgxZTE1ZDQ4ZDc3YmZjYzQwMDNkNDYxZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTAzICBPamFuIFZhZmFpICA8b2phbkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgSGlzdG9ncmFtIHRvdGFsIGFsbG9jYXRlZCBieXRlcyBp biB0aGUgYXJlbmEgaW4gYWRkaXRpb24gdG8gdGhlIHJlbmRlciB0cmVlIHNpemUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1NTM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFzcyBpbiB0aGUgYnl0ZXNB bGxvY2F0ZWQgb3V0IHBhcmFtLiBJIGNvdWxkbid0IGZpZ3VyZSBvdXQgaG93IHRvIG1ha2UKKyAg ICAgICAgYSBzaXplX3QgdGhlIGRlZmF1bHQgb3V0IHBhcmFtIHZhbHVlIGluIFJlbmRlckFyZW5h LmguIFRoYXQgbWlnaHQganVzdCBiZQorICAgICAgICBteSBsYWNrIG9mIEMrKyBmb28gdGhvdWdo LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlOjpyZW5kZXJUcmVlU2l6ZSk6CisKIDIwMTItMDUtMDMgIE1pY2hhZWwg QnLDvG5pbmcgIDxtaWNoYWVsLmJydW5pbmdAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0sy XSBBbHNvIHVwZGF0ZSBRdDo6SW1FbmFibGVkIGZsYWcgd2hlbiB1cGRhdGluZyB0aGUgaW5wdXQg bWV0aG9kLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKaW5kZXggN2M0NGM0NDAxMjZhMTY4NzJmNjEwNjkyN2Q4 OTM2ZTE2NWFkOGE3Ny4uODgxYmUyOWMxM2I2MmRhMDI5ZDdiYjZkOGM3ZDRhMGQ4ZmZiNzk3MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2UuY3BwCkBAIC0yMTAsMTIgKzIxMCwxNyBAQCBQYWdlOjp+UGFnZSgpCiAK IH0KIAotc2l6ZV90IFBhZ2U6OnJlbmRlclRyZWVTaXplKCkgY29uc3QKK3NpemVfdCBQYWdlOjpy ZW5kZXJUcmVlU2l6ZShzaXplX3QmIGFsbG9jYXRlZEJ5dGVzKSBjb25zdAogeworICAgIGFsbG9j YXRlZEJ5dGVzID0gMDsKICAgICBzaXplX3Qgc2l6ZSA9IDA7CiAgICAgZm9yIChGcmFtZSogZnJh bWUgPSBtYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJhdmVyc2VO ZXh0KCkpIHsKLSAgICAgICAgaWYgKGZyYW1lLT5kb2N1bWVudCgpICYmIGZyYW1lLT5kb2N1bWVu dCgpLT5yZW5kZXJBcmVuYSgpKQotICAgICAgICAgICAgc2l6ZSArPSBmcmFtZS0+ZG9jdW1lbnQo KS0+cmVuZGVyQXJlbmEoKS0+dG90YWxSZW5kZXJBcmVuYVNpemUoKTsKKyAgICAgICAgaWYgKCFm cmFtZS0+ZG9jdW1lbnQoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBpZiAoUmVu ZGVyQXJlbmEqIGFyZW5hID0gZnJhbWUtPmRvY3VtZW50KCktPnJlbmRlckFyZW5hKCkpIHsKKyAg ICAgICAgICAgIHNpemUgKz0gYXJlbmEtPnRvdGFsUmVuZGVyQXJlbmFTaXplKCk7CisgICAgICAg ICAgICBhbGxvY2F0ZWRCeXRlcyArPSBhcmVuYS0+dG90YWxSZW5kZXJBcmVuYUFsbG9jYXRlZEJ5 dGVzKCk7CisgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIHNpemU7CiB9CkBAIC0xMDI5LDgg KzEwMzQsMTIgQEAgdm9pZCBQYWdlOjpzZXRWaXNpYmlsaXR5U3RhdGUoUGFnZVZpc2liaWxpdHlT dGF0ZSB2aXNpYmlsaXR5U3RhdGUsIGJvb2wgaXNJbml0aWEKICAgICBtX3Zpc2liaWxpdHlTdGF0 ZSA9IHZpc2liaWxpdHlTdGF0ZTsKIAogICAgIGlmICghaXNJbml0aWFsU3RhdGUgJiYgbV9tYWlu RnJhbWUpIHsKLSAgICAgICAgaWYgKHZpc2liaWxpdHlTdGF0ZSA9PSBQYWdlVmlzaWJpbGl0eVN0 YXRlSGlkZGVuKQotICAgICAgICAgICAgSGlzdG9ncmFtU3VwcG9ydDo6aGlzdG9ncmFtQ3VzdG9t Q291bnRzKCJXZWJDb3JlLlBhZ2UucmVuZGVyVHJlZVNpemVCeXRlcyIsIHJlbmRlclRyZWVTaXpl KCksIDEwMDAsIDUwMDAwMDAwMCwgNTApOworICAgICAgICBpZiAodmlzaWJpbGl0eVN0YXRlID09 IFBhZ2VWaXNpYmlsaXR5U3RhdGVIaWRkZW4pIHsKKyAgICAgICAgICAgIHNpemVfdCBhbGxvY2F0 ZWRCeXRlcyA9IDA7CisgICAgICAgICAgICBzaXplX3Qgc2l6ZSA9IHJlbmRlclRyZWVTaXplKGFs bG9jYXRlZEJ5dGVzKTsKKyAgICAgICAgICAgIEhpc3RvZ3JhbVN1cHBvcnQ6Omhpc3RvZ3JhbUN1 c3RvbUNvdW50cygiV2ViQ29yZS5QYWdlLnJlbmRlclRyZWVTaXplQnl0ZXMiLCBzaXplLCAxMDAw LCA1MDAwMDAwMDAsIDUwKTsKKyAgICAgICAgICAgIEhpc3RvZ3JhbVN1cHBvcnQ6Omhpc3RvZ3Jh bUN1c3RvbUNvdW50cygiV2ViQ29yZS5QYWdlLnJlbmRlclRyZWVBbGxvY2F0ZWRCeXRlcyIsIGFs bG9jYXRlZEJ5dGVzLCAxMDAwLCA1MDAwMDAwMDAsIDUwKTsKKyAgICAgICAgfQogICAgICAgICBt X21haW5GcmFtZS0+ZGlzcGF0Y2hWaXNpYmlsaXR5U3RhdGVDaGFuZ2VFdmVudCgpOwogICAgIH0K IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oIGIvU291cmNlL1dlYkNv cmUvcGFnZS9QYWdlLmgKaW5kZXggMDNjN2ZmZGJiNTZlZjYxNmM2MTg1ZjBhN2M5YjFhZmFlYjk0 Y2NmMC4uY2RkNGUxODI1NjU1Njg0Y2ZkMThmMTg2ZmZjZjcyMGY1NGRjZjgxYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Q YWdlLmgKQEAgLTExOCw3ICsxMTgsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFBh Z2UoUGFnZUNsaWVudHMmKTsKICAgICAgICAgflBhZ2UoKTsKIAotICAgICAgICBzaXplX3QgcmVu ZGVyVHJlZVNpemUoKSBjb25zdDsKKyAgICAgICAgc2l6ZV90IHJlbmRlclRyZWVTaXplKHNpemVf dCYgdG90YWxSZW5kZXJBcmVuYUFsbG9jYXRlZEJ5dGVzKSBjb25zdDsKIAogICAgICAgICB2b2lk IHNldE5lZWRzUmVjYWxjU3R5bGVJbkFsbEZyYW1lcygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9BcmVuYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9BcmVu YS5jcHAKaW5kZXggZjMwNWYxNjkxNGU3ZmJiNDU1NmE5MDdlYjE5ZTM5Y2EwOGFiZmM5YS4uNjA2 MDkyNjI2MzcwYWVkM2FlNWYxMmYzMzQ5OWFkZTMyNjE0ODdhNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vQXJlbmEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0FyZW5hLmNwcApAQCAtOTcsNyArOTcsNyBAQCB2b2lkIEluaXRBcmVuYVBvb2woQXJlbmFQb29s KiBwb29sLCBjb25zdCBjaGFyKiwgdW5zaWduZWQgc2l6ZSwgdW5zaWduZWQgYWxpZ24pCiAgICAg IHBvb2wtPmFyZW5hc2l6ZSA9IHNpemU7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IAogfQogCi12b2lkKiBBcmVuYUFsbG9jYXRlKEFyZW5hUG9vbCogcG9vbCwgdW5zaWduZWQgaW50 IG51bUJ5dGVzKQordm9pZCogQXJlbmFBbGxvY2F0ZShBcmVuYVBvb2wqIHBvb2wsIHVuc2lnbmVk IGludCBudW1CeXRlcywgdW5zaWduZWQgaW50JiBieXRlc0FsbG9jYXRlZCkKIHsKICAgICBBcmVu YSogYXJlbmE7CiAgICAgY2hhciogcmV0dXJuUG9pbnRlcjsKQEAgLTEyNyw2ICsxMjcsNyBAQCB2 b2lkKiBBcmVuYUFsbG9jYXRlKEFyZW5hUG9vbCogcG9vbCwgdW5zaWduZWQgaW50IG51bUJ5dGVz KQogICAgICAgICBpKys7CiAgICAgICAgIHByaW50ZigiTWFsbG9jOiAlZFxuIiwgaSk7CiAjZW5k aWYKKyAgICAgICAgYnl0ZXNBbGxvY2F0ZWQgPSBzaXplOwogICAgICAgICBhcmVuYSA9IChBcmVu YSopZmFzdE1hbGxvYyhzaXplKTsKICAgICAgICAgLy8gZmFzdE1hbGxvYyB3aWxsIGFib3J0KCkg aWYgaXQgZmFpbHMsIHNvIHdlIGFyZSBndWFyYW50ZWVkIHRoYXQgYSBpcyBub3QgMC4KICAgICAg ICAgYXJlbmEtPmxpbWl0ID0gKHV3b3JkKWFyZW5hICsgc2l6ZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL0FyZW5hLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9BcmVu YS5oCmluZGV4IDk2YzMxZTUwMmRkNDMyYzQ4YmFjNDQxZjM3YzdkMmI2NTMyNzVkNjYuLmMxMTg1 ZTQ3ZmM3MDMzNWMyNjQzYzYxZjc0ZTAxNzRhMDVlNzIzMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL0FyZW5hLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQXJl bmEuaApAQCAtNjksMTcgKzY5LDE3IEBAIHN0cnVjdCBBcmVuYVBvb2wgewogCiB2b2lkIEluaXRB cmVuYVBvb2woQXJlbmFQb29sKiwgY29uc3QgY2hhciogbmFtZSwgdW5zaWduZWQgaW50IHNpemUs IHVuc2lnbmVkIGludCBhbGlnbik7CiB2b2lkIEZpbmlzaEFyZW5hUG9vbChBcmVuYVBvb2wqKTsK LXZvaWQqIEFyZW5hQWxsb2NhdGUoQXJlbmFQb29sKiwgdW5zaWduZWQgaW50IG5iKTsKK3ZvaWQq IEFyZW5hQWxsb2NhdGUoQXJlbmFQb29sKiwgdW5zaWduZWQgaW50IG51bUJ5dGVzLCB1bnNpZ25l ZCBpbnQmIGJ5dGVzQWxsb2NhdGVkKTsKIAogI2RlZmluZSBBUkVOQV9BTElHTihuKSAoKCh1d29y ZCkobikgKyBBUkVOQV9BTElHTl9NQVNLKSAmIH5BUkVOQV9BTElHTl9NQVNLKQogI2RlZmluZSBJ TklUX0FSRU5BX1BPT0wocG9vbCwgbmFtZSwgc2l6ZSkgSW5pdEFyZW5hUG9vbChwb29sLCBuYW1l LCBzaXplLCBBUkVOQV9BTElHTl9NQVNLICsgMSkKLSNkZWZpbmUgQVJFTkFfQUxMT0NBVEUocCwg cG9vbCwgbmIpIFwKKyNkZWZpbmUgQVJFTkFfQUxMT0NBVEUocCwgcG9vbCwgbmIsIGJ5dGVzQWxs b2NhdGVkKSBcCiAgICAgQXJlbmEqIF9hID0gKHBvb2wpLT5jdXJyZW50OyBcCiAgICAgdW5zaWdu ZWQgaW50IF9uYiA9IEFSRU5BX0FMSUdOKG5iKTsgXAogICAgIHV3b3JkIF9wID0gX2EtPmF2YWls OyBcCiAgICAgdXdvcmQgX3EgPSBfcCArIF9uYjsgXAogICAgIGlmIChfcSA+IF9hLT5saW1pdCkg XAotICAgICAgICBfcCA9ICh1d29yZClBcmVuYUFsbG9jYXRlKHBvb2wsIF9uYik7IFwKKyAgICAg ICAgX3AgPSAodXdvcmQpQXJlbmFBbGxvY2F0ZShwb29sLCBfbmIsICpieXRlc0FsbG9jYXRlZCk7 IFwKICAgICBlbHNlIFwKICAgICAgICAgX2EtPmF2YWlsID0gX3E7IFwKICAgICBwID0gKHZvaWQq KV9wOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckFyZW5hLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJBcmVuYS5jcHAKaW5kZXggNmM0YzVk YzE1MTU0ODM2OWU1NzhhNjM1MDA5ZGIzMzdkMGI2MzE0NS4uYjAxZjY1ZGRkNWY0NmE0NmUyMThj MzhlMGIyMTQ4M2E3YTdiYmM1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckFyZW5hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQXJl bmEuY3BwCkBAIC0xMTAsNyArMTEwLDkgQEAgdm9pZCogUmVuZGVyQXJlbmE6OmFsbG9jYXRlKHNp emVfdCBzaXplKQogCiAgICAgaWYgKCFyZXN1bHQpIHsKICAgICAgICAgLy8gQWxsb2NhdGUgYSBu ZXcgY2h1bmsgZnJvbSB0aGUgYXJlbmEKLSAgICAgICAgQVJFTkFfQUxMT0NBVEUocmVzdWx0LCAm bV9wb29sLCBzaXplKTsKKyAgICAgICAgdW5zaWduZWQgYnl0ZXNBbGxvY2F0ZWQgPSAwOworICAg ICAgICBBUkVOQV9BTExPQ0FURShyZXN1bHQsICZtX3Bvb2wsIHNpemUsICZieXRlc0FsbG9jYXRl ZCk7CisgICAgICAgIG1fdG90YWxBbGxvY2F0ZWQgKz0gYnl0ZXNBbGxvY2F0ZWQ7CiAgICAgfQog CiAgICAgcmV0dXJuIHJlc3VsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJBcmVuYS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckFyZW5hLmgK aW5kZXggOTE1MGU3MTM1MjIyNGZhNDU0NmIwMDM1YjFhZGE2YmVlMTc1ODZlNy4uMGI2NGUxODc3 ODU3NWYzNGM5NjY4Y2NmZjBmODJjNTNiNThjYmU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckFyZW5hLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckFyZW5hLmgKQEAgLTU0LDYgKzU0LDcgQEAgcHVibGljOgogICAgIHZvaWQgZnJlZShz aXplX3QsIHZvaWQqKTsKIAogICAgIHNpemVfdCB0b3RhbFJlbmRlckFyZW5hU2l6ZSgpIGNvbnN0 IHsgcmV0dXJuIG1fdG90YWxTaXplOyB9CisgICAgc2l6ZV90IHRvdGFsUmVuZGVyQXJlbmFBbGxv Y2F0ZWRCeXRlcygpIGNvbnN0IHsgcmV0dXJuIG1fdG90YWxBbGxvY2F0ZWQ7IH0KIAogcHJpdmF0 ZToKICAgICAvLyBVbmRlcmx5aW5nIGFyZW5hIHBvb2wKQEAgLTY0LDYgKzY1LDcgQEAgcHJpdmF0 ZToKICAgICB2b2lkKiBtX3JlY3ljbGVyc1tnTWF4UmVjeWNsZWRTaXplID4+IDJdOwogCiAgICAg c2l6ZV90IG1fdG90YWxTaXplOworICAgIHNpemVfdCBtX3RvdGFsQWxsb2NhdGVkOwogfTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwCmluZGV4IDhjMTYxN2I4MjlmZmYzZjY2YzU5NzdkZWE0M2IwN2FmMzY3 N2RiMTkuLjA0NTJiNDQyZGZhM2Y5NWI0Nzg2NTA2MzY1YWNiMzg5NGEyZmM3NWEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTUwMSw3ICs1 MDEsOCBAQCB1aW50NjRfdCBXZWJQYWdlOjpyZW5kZXJUcmVlU2l6ZSgpIGNvbnN0CiB7CiAgICAg aWYgKCFtX3BhZ2UpCiAgICAgICAgIHJldHVybiAwOwotICAgIHJldHVybiBtX3BhZ2UtPnJlbmRl clRyZWVTaXplKCk7CisgICAgc2l6ZV90IGFsbG9jYXRlZEJ5dGVzID0gMDsKKyAgICByZXR1cm4g bV9wYWdlLT5yZW5kZXJUcmVlU2l6ZShhbGxvY2F0ZWRCeXRlcyk7CiB9CiAKIHZvaWQgV2ViUGFn ZTo6c2V0UGFpbnRlZE9iamVjdHNDb3VudGVyVGhyZXNob2xkKHVpbnQ2NF90IHRocmVzaG9sZCkK 140109 2012-05-03 15:22:18 -0700 2012-05-03 16:08:15 -0700 Patch bug-85537-20120503152217.patch text/plain 9070 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1OTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTMxNWFjMTk1YWVlODdk ZGYxMzJiOTQ2Mzg1NmFhYjBhNzA4YmUyYS4uMmFlMDQxMDk2ODYwOTc0ODBkODYzMDYwY2I5Mzli ODA3NmU0MTJiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA1LTAzICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSGlzdG9ncmFtIHRvdGFsIGFs bG9jYXRlZCBieXRlcyBpbiB0aGUgYXJlbmEgaW4gYWRkaXRpb24gdG8gdGhlIHJlbmRlciB0cmVl IHNpemUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1 NTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ug b25seSBmcmVlIGJ5dGVzIGFsbG9jYXRlZCB0byBhIFJlbmRlckFyZW5hIHdoZW4gZGVzdHJveWlu ZyB0aGUgRG9jdW1lbnQuCisgICAgICAgIEhpc3RvZ3JhbSBib3RoIHRoZSByZW5kZXIgdHJlZSBz aXplIGFuZCB0aGUgdG90YWwgYnl0ZXMgYWxsb2NhdGVkLiBUaGlzCisgICAgICAgIGdpdmVzIGEg YmV0dGVyIHNlbnNlIG9mIHRoZSBvdmVyaGVhZCBvZiBSZW5kZXJBcmVuYSBhcyB3ZWxsIGFzIGdp dmluZyBhIG1vcmUKKyAgICAgICAgYWNjdXJhdGUgbnVtYmVyIGZvciB0aGUgYW1vdW50IG9mIGFj dHVhbCBtZW1vcnkgdXNlZCBieSB0aGUgcmVuZGVyIHRyZWUuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLiBUaGlzIGlzIG5vdCB3ZWJmYWNpbmcsIHNvIHRoaXMgY2FuJ3QgYmUgdGVzdGVkIHdpdGhv dXQgYWRkaW5nCisgICAgICAgIEFQSSB0byBsYXlvdXQgdGVzdCBjb250cm9sbGVyLCB3aGljaCBk b2Vzbid0IHNlZW0gd29ydGggaXQgZm9yIHRoaXMgY29kZS4KKworICAgICAgICAqIHBhZ2UvUGFn ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpyZW5kZXJUcmVlU2l6ZSk6CisgICAgICAg IChXZWJDb3JlOjpQYWdlOjpzZXRWaXNpYmlsaXR5U3RhdGUpOgorICAgICAgICAqIHBhZ2UvUGFn ZS5oOgorICAgICAgICAoUGFnZSk6CisgICAgICAgICogcGxhdGZvcm0vQXJlbmEuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QXJlbmFBbGxvY2F0ZSk6CisgICAgICAgICogcGxhdGZvcm0vQXJlbmEu aDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJBcmVuYS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJBcmVuYTo6YWxsb2NhdGUpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJBcmVuYS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQXJlbmE6 OnRvdGFsUmVuZGVyQXJlbmFBbGxvY2F0ZWRCeXRlcyk6CisgICAgICAgIChSZW5kZXJBcmVuYSk6 CisKIDIwMTItMDUtMDMgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgUmVtb3ZlIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZGlkU3RhcnRBY2NlbGVyYXRl ZEFuaW1hdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODE4MmJiNzJkMjcyYThjMDJkNjkxOGYyNzczMGYz ZWNmNTliOTk3ZS4uY2RhNGY4ZGU0Mzg2NmFhYTY3ZTM3OTBiYzMyNWVkNDI3NzAyMjQ5OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA1LTAzICBPamFuIFZhZmFpICA8b2phbkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgSGlzdG9ncmFtIHRvdGFsIGFsbG9jYXRlZCBieXRlcyBp biB0aGUgYXJlbmEgaW4gYWRkaXRpb24gdG8gdGhlIHJlbmRlciB0cmVlIHNpemUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1NTM3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlbmRlclRyZWVTaXpl KToKKwogMjAxMi0wNS0wMyAgTWljaGFlbCBCcsO8bmluZyAgPG1pY2hhZWwuYnJ1bmluZ0Bub2tp YS5jb20+CiAKICAgICAgICAgW1F0XVtXSzJdIEFsc28gdXBkYXRlIFF0OjpJbUVuYWJsZWQgZmxh ZyB3aGVuIHVwZGF0aW5nIHRoZSBpbnB1dCBtZXRob2QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCA3 YzQ0YzQ0MDEyNmExNjg3MmY2MTA2OTI3ZDg5MzZlMTY1YWQ4YTc3Li42MDcxMWI5MjJkMjMxNmFi MWEwMGYwZTI1YWFkMTBiNjFhZWM5MjM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTIxMCwxNCAr MjEwLDE4IEBAIFBhZ2U6On5QYWdlKCkKIAogfQogCi1zaXplX3QgUGFnZTo6cmVuZGVyVHJlZVNp emUoKSBjb25zdAorQXJlbmFTaXplIFBhZ2U6OnJlbmRlclRyZWVTaXplKCkgY29uc3QKIHsKLSAg ICBzaXplX3Qgc2l6ZSA9IDA7CisgICAgQXJlbmFTaXplIHRvdGFsKDAsIDApOwogICAgIGZvciAo RnJhbWUqIGZyYW1lID0gbWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCkt PnRyYXZlcnNlTmV4dCgpKSB7Ci0gICAgICAgIGlmIChmcmFtZS0+ZG9jdW1lbnQoKSAmJiBmcmFt ZS0+ZG9jdW1lbnQoKS0+cmVuZGVyQXJlbmEoKSkKLSAgICAgICAgICAgIHNpemUgKz0gZnJhbWUt PmRvY3VtZW50KCktPnJlbmRlckFyZW5hKCktPnRvdGFsUmVuZGVyQXJlbmFTaXplKCk7CisgICAg ICAgIGlmICghZnJhbWUtPmRvY3VtZW50KCkpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgaWYgKFJlbmRlckFyZW5hKiBhcmVuYSA9IGZyYW1lLT5kb2N1bWVudCgpLT5yZW5kZXJBcmVu YSgpKSB7CisgICAgICAgICAgICB0b3RhbC50cmVlU2l6ZSArPSBhcmVuYS0+dG90YWxSZW5kZXJB cmVuYVNpemUoKTsKKyAgICAgICAgICAgIHRvdGFsLmFsbG9jYXRlZCArPSBhcmVuYS0+dG90YWxS ZW5kZXJBcmVuYUFsbG9jYXRlZEJ5dGVzKCk7CisgICAgICAgIH0KICAgICB9Ci0gICAgcmV0dXJu IHNpemU7CisgICAgcmV0dXJuIHRvdGFsOwogfQogCiBWaWV3cG9ydEFyZ3VtZW50cyBQYWdlOjp2 aWV3cG9ydEFyZ3VtZW50cygpIGNvbnN0CkBAIC0xMDI5LDggKzEwMzMsMTEgQEAgdm9pZCBQYWdl OjpzZXRWaXNpYmlsaXR5U3RhdGUoUGFnZVZpc2liaWxpdHlTdGF0ZSB2aXNpYmlsaXR5U3RhdGUs IGJvb2wgaXNJbml0aWEKICAgICBtX3Zpc2liaWxpdHlTdGF0ZSA9IHZpc2liaWxpdHlTdGF0ZTsK IAogICAgIGlmICghaXNJbml0aWFsU3RhdGUgJiYgbV9tYWluRnJhbWUpIHsKLSAgICAgICAgaWYg KHZpc2liaWxpdHlTdGF0ZSA9PSBQYWdlVmlzaWJpbGl0eVN0YXRlSGlkZGVuKQotICAgICAgICAg ICAgSGlzdG9ncmFtU3VwcG9ydDo6aGlzdG9ncmFtQ3VzdG9tQ291bnRzKCJXZWJDb3JlLlBhZ2Uu cmVuZGVyVHJlZVNpemVCeXRlcyIsIHJlbmRlclRyZWVTaXplKCksIDEwMDAsIDUwMDAwMDAwMCwg NTApOworICAgICAgICBpZiAodmlzaWJpbGl0eVN0YXRlID09IFBhZ2VWaXNpYmlsaXR5U3RhdGVI aWRkZW4pIHsKKyAgICAgICAgICAgIEFyZW5hU2l6ZSBzaXplID0gcmVuZGVyVHJlZVNpemUoKTsK KyAgICAgICAgICAgIEhpc3RvZ3JhbVN1cHBvcnQ6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cygiV2Vi Q29yZS5QYWdlLnJlbmRlclRyZWVTaXplQnl0ZXMiLCBzaXplLnRyZWVTaXplLCAxMDAwLCA1MDAw MDAwMDAsIDUwKTsKKyAgICAgICAgICAgIEhpc3RvZ3JhbVN1cHBvcnQ6Omhpc3RvZ3JhbUN1c3Rv bUNvdW50cygiV2ViQ29yZS5QYWdlLnJlbmRlclRyZWVBbGxvY2F0ZWRCeXRlcyIsIHNpemUuYWxs b2NhdGVkLCAxMDAwLCA1MDAwMDAwMDAsIDUwKTsKKyAgICAgICAgfQogICAgICAgICBtX21haW5G cmFtZS0+ZGlzcGF0Y2hWaXNpYmlsaXR5U3RhdGVDaGFuZ2VFdmVudCgpOwogICAgIH0KIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9QYWdlLmgKaW5kZXggMDNjN2ZmZGJiNTZlZjYxNmM2MTg1ZjBhN2M5YjFhZmFlYjk0Y2NmMC4u YjZkZWQ4MjgzZWFhZjEyNWFhMjRjZDhlYWU4MDk2ODliYjNmZjAwYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmgK QEAgLTkxLDYgKzkxLDE2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgIGZsb2F0IGRldmlj ZVNjYWxlRmFjdG9yKEZyYW1lKik7CiAKKyAgICBzdHJ1Y3QgQXJlbmFTaXplIHsKKyAgICAgICAg QXJlbmFTaXplKHNpemVfdCB0cmVlU2l6ZSwgc2l6ZV90IGFsbG9jYXRlZCkKKyAgICAgICAgICAg IDogdHJlZVNpemUodHJlZVNpemUpCisgICAgICAgICAgICAsIGFsbG9jYXRlZChhbGxvY2F0ZWQp CisgICAgICAgIHsKKyAgICAgICAgfQorICAgICAgICBzaXplX3QgdHJlZVNpemU7CisgICAgICAg IHNpemVfdCBhbGxvY2F0ZWQ7CisgICAgfTsKKwogICAgIGNsYXNzIFBhZ2UgOiBwdWJsaWMgU3Vw cGxlbWVudGFibGU8UGFnZT4gewogICAgICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShQYWdlKTsK ICAgICAgICAgZnJpZW5kIGNsYXNzIFNldHRpbmdzOwpAQCAtMTE4LDcgKzEyOCw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgUGFnZShQYWdlQ2xpZW50cyYpOwogICAgICAgICB+UGFn ZSgpOwogCi0gICAgICAgIHNpemVfdCByZW5kZXJUcmVlU2l6ZSgpIGNvbnN0OworICAgICAgICBB cmVuYVNpemUgcmVuZGVyVHJlZVNpemUoKSBjb25zdDsKIAogICAgICAgICB2b2lkIHNldE5lZWRz UmVjYWxjU3R5bGVJbkFsbEZyYW1lcygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9BcmVuYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9BcmVuYS5jcHAKaW5k ZXggZjMwNWYxNjkxNGU3ZmJiNDU1NmE5MDdlYjE5ZTM5Y2EwOGFiZmM5YS4uNjA2MDkyNjI2Mzcw YWVkM2FlNWYxMmYzMzQ5OWFkZTMyNjE0ODdhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vQXJlbmEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0FyZW5hLmNw cApAQCAtOTcsNyArOTcsNyBAQCB2b2lkIEluaXRBcmVuYVBvb2woQXJlbmFQb29sKiBwb29sLCBj b25zdCBjaGFyKiwgdW5zaWduZWQgc2l6ZSwgdW5zaWduZWQgYWxpZ24pCiAgICAgIHBvb2wtPmFy ZW5hc2l6ZSA9IHNpemU7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogfQogCi12 b2lkKiBBcmVuYUFsbG9jYXRlKEFyZW5hUG9vbCogcG9vbCwgdW5zaWduZWQgaW50IG51bUJ5dGVz KQordm9pZCogQXJlbmFBbGxvY2F0ZShBcmVuYVBvb2wqIHBvb2wsIHVuc2lnbmVkIGludCBudW1C eXRlcywgdW5zaWduZWQgaW50JiBieXRlc0FsbG9jYXRlZCkKIHsKICAgICBBcmVuYSogYXJlbmE7 CiAgICAgY2hhciogcmV0dXJuUG9pbnRlcjsKQEAgLTEyNyw2ICsxMjcsNyBAQCB2b2lkKiBBcmVu YUFsbG9jYXRlKEFyZW5hUG9vbCogcG9vbCwgdW5zaWduZWQgaW50IG51bUJ5dGVzKQogICAgICAg ICBpKys7CiAgICAgICAgIHByaW50ZigiTWFsbG9jOiAlZFxuIiwgaSk7CiAjZW5kaWYKKyAgICAg ICAgYnl0ZXNBbGxvY2F0ZWQgPSBzaXplOwogICAgICAgICBhcmVuYSA9IChBcmVuYSopZmFzdE1h bGxvYyhzaXplKTsKICAgICAgICAgLy8gZmFzdE1hbGxvYyB3aWxsIGFib3J0KCkgaWYgaXQgZmFp bHMsIHNvIHdlIGFyZSBndWFyYW50ZWVkIHRoYXQgYSBpcyBub3QgMC4KICAgICAgICAgYXJlbmEt PmxpbWl0ID0gKHV3b3JkKWFyZW5hICsgc2l6ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL0FyZW5hLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9BcmVuYS5oCmluZGV4 IDk2YzMxZTUwMmRkNDMyYzQ4YmFjNDQxZjM3YzdkMmI2NTMyNzVkNjYuLmMxMTg1ZTQ3ZmM3MDMz NWMyNjQzYzYxZjc0ZTAxNzRhMDVlNzIzMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL0FyZW5hLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQXJlbmEuaApAQCAt NjksMTcgKzY5LDE3IEBAIHN0cnVjdCBBcmVuYVBvb2wgewogCiB2b2lkIEluaXRBcmVuYVBvb2wo QXJlbmFQb29sKiwgY29uc3QgY2hhciogbmFtZSwgdW5zaWduZWQgaW50IHNpemUsIHVuc2lnbmVk IGludCBhbGlnbik7CiB2b2lkIEZpbmlzaEFyZW5hUG9vbChBcmVuYVBvb2wqKTsKLXZvaWQqIEFy ZW5hQWxsb2NhdGUoQXJlbmFQb29sKiwgdW5zaWduZWQgaW50IG5iKTsKK3ZvaWQqIEFyZW5hQWxs b2NhdGUoQXJlbmFQb29sKiwgdW5zaWduZWQgaW50IG51bUJ5dGVzLCB1bnNpZ25lZCBpbnQmIGJ5 dGVzQWxsb2NhdGVkKTsKIAogI2RlZmluZSBBUkVOQV9BTElHTihuKSAoKCh1d29yZCkobikgKyBB UkVOQV9BTElHTl9NQVNLKSAmIH5BUkVOQV9BTElHTl9NQVNLKQogI2RlZmluZSBJTklUX0FSRU5B X1BPT0wocG9vbCwgbmFtZSwgc2l6ZSkgSW5pdEFyZW5hUG9vbChwb29sLCBuYW1lLCBzaXplLCBB UkVOQV9BTElHTl9NQVNLICsgMSkKLSNkZWZpbmUgQVJFTkFfQUxMT0NBVEUocCwgcG9vbCwgbmIp IFwKKyNkZWZpbmUgQVJFTkFfQUxMT0NBVEUocCwgcG9vbCwgbmIsIGJ5dGVzQWxsb2NhdGVkKSBc CiAgICAgQXJlbmEqIF9hID0gKHBvb2wpLT5jdXJyZW50OyBcCiAgICAgdW5zaWduZWQgaW50IF9u YiA9IEFSRU5BX0FMSUdOKG5iKTsgXAogICAgIHV3b3JkIF9wID0gX2EtPmF2YWlsOyBcCiAgICAg dXdvcmQgX3EgPSBfcCArIF9uYjsgXAogICAgIGlmIChfcSA+IF9hLT5saW1pdCkgXAotICAgICAg ICBfcCA9ICh1d29yZClBcmVuYUFsbG9jYXRlKHBvb2wsIF9uYik7IFwKKyAgICAgICAgX3AgPSAo dXdvcmQpQXJlbmFBbGxvY2F0ZShwb29sLCBfbmIsICpieXRlc0FsbG9jYXRlZCk7IFwKICAgICBl bHNlIFwKICAgICAgICAgX2EtPmF2YWlsID0gX3E7IFwKICAgICBwID0gKHZvaWQqKV9wOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckFyZW5hLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJBcmVuYS5jcHAKaW5kZXggNmM0YzVkYzE1MTU0ODM2 OWU1NzhhNjM1MDA5ZGIzMzdkMGI2MzE0NS4uYjAxZjY1ZGRkNWY0NmE0NmUyMThjMzhlMGIyMTQ4 M2E3YTdiYmM1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckFy ZW5hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQXJlbmEuY3BwCkBA IC0xMTAsNyArMTEwLDkgQEAgdm9pZCogUmVuZGVyQXJlbmE6OmFsbG9jYXRlKHNpemVfdCBzaXpl KQogCiAgICAgaWYgKCFyZXN1bHQpIHsKICAgICAgICAgLy8gQWxsb2NhdGUgYSBuZXcgY2h1bmsg ZnJvbSB0aGUgYXJlbmEKLSAgICAgICAgQVJFTkFfQUxMT0NBVEUocmVzdWx0LCAmbV9wb29sLCBz aXplKTsKKyAgICAgICAgdW5zaWduZWQgYnl0ZXNBbGxvY2F0ZWQgPSAwOworICAgICAgICBBUkVO QV9BTExPQ0FURShyZXN1bHQsICZtX3Bvb2wsIHNpemUsICZieXRlc0FsbG9jYXRlZCk7CisgICAg ICAgIG1fdG90YWxBbGxvY2F0ZWQgKz0gYnl0ZXNBbGxvY2F0ZWQ7CiAgICAgfQogCiAgICAgcmV0 dXJuIHJlc3VsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJB cmVuYS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckFyZW5hLmgKaW5kZXggOTE1 MGU3MTM1MjIyNGZhNDU0NmIwMDM1YjFhZGE2YmVlMTc1ODZlNy4uMGI2NGUxODc3ODU3NWYzNGM5 NjY4Y2NmZjBmODJjNTNiNThjYmU5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckFyZW5hLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckFy ZW5hLmgKQEAgLTU0LDYgKzU0LDcgQEAgcHVibGljOgogICAgIHZvaWQgZnJlZShzaXplX3QsIHZv aWQqKTsKIAogICAgIHNpemVfdCB0b3RhbFJlbmRlckFyZW5hU2l6ZSgpIGNvbnN0IHsgcmV0dXJu IG1fdG90YWxTaXplOyB9CisgICAgc2l6ZV90IHRvdGFsUmVuZGVyQXJlbmFBbGxvY2F0ZWRCeXRl cygpIGNvbnN0IHsgcmV0dXJuIG1fdG90YWxBbGxvY2F0ZWQ7IH0KIAogcHJpdmF0ZToKICAgICAv LyBVbmRlcmx5aW5nIGFyZW5hIHBvb2wKQEAgLTY0LDYgKzY1LDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkKiBtX3JlY3ljbGVyc1tnTWF4UmVjeWNsZWRTaXplID4+IDJdOwogCiAgICAgc2l6ZV90IG1f dG90YWxTaXplOworICAgIHNpemVfdCBtX3RvdGFsQWxsb2NhdGVkOwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UuY3BwCmluZGV4IDhjMTYxN2I4MjlmZmYzZjY2YzU5NzdkZWE0M2IwN2FmMzY3N2RiMTkuLjk2 MTllNzg3NTNhMTMwMjA5MjQ5MWZhZGI1YWY5MmE2NjEyZDczZmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTUwMSw3ICs1MDEsNyBAQCB1 aW50NjRfdCBXZWJQYWdlOjpyZW5kZXJUcmVlU2l6ZSgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX3Bh Z2UpCiAgICAgICAgIHJldHVybiAwOwotICAgIHJldHVybiBtX3BhZ2UtPnJlbmRlclRyZWVTaXpl KCk7CisgICAgcmV0dXJuIG1fcGFnZS0+cmVuZGVyVHJlZVNpemUoKS5zaXplOwogfQogCiB2b2lk IFdlYlBhZ2U6OnNldFBhaW50ZWRPYmplY3RzQ291bnRlclRocmVzaG9sZCh1aW50NjRfdCB0aHJl c2hvbGQpCg== 140118 2012-05-03 16:08:20 -0700 2012-05-03 18:34:58 -0700 Patch bug-85537-20120503160819.patch text/plain 9027 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU3MzI2MTc5MDYxNGM4 ZGQ4NDYxODE5MWMzOTU1NzBmYWViZDc4My4uNjg3YTJiZDc0YjE0NGUyYTUzNzU1N2ViNmEyMWEx ZWJmYmJkYzhhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDEyLTA1LTAzICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSGlzdG9ncmFtIHRvdGFsIGFs bG9jYXRlZCBieXRlcyBpbiB0aGUgYXJlbmEgaW4gYWRkaXRpb24gdG8gdGhlIHJlbmRlciB0cmVl IHNpemUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1 NTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ug b25seSBmcmVlIGJ5dGVzIGFsbG9jYXRlZCB0byBhIFJlbmRlckFyZW5hIHdoZW4gZGVzdHJveWlu ZyB0aGUgRG9jdW1lbnQuCisgICAgICAgIEhpc3RvZ3JhbSBib3RoIHRoZSByZW5kZXIgdHJlZSBz aXplIGFuZCB0aGUgdG90YWwgYnl0ZXMgYWxsb2NhdGVkLiBUaGlzCisgICAgICAgIGdpdmVzIGEg YmV0dGVyIHNlbnNlIG9mIHRoZSBvdmVyaGVhZCBvZiBSZW5kZXJBcmVuYSBhcyB3ZWxsIGFzIGdp dmluZyBhIG1vcmUKKyAgICAgICAgYWNjdXJhdGUgbnVtYmVyIGZvciB0aGUgYW1vdW50IG9mIGFj dHVhbCBtZW1vcnkgdXNlZCBieSB0aGUgcmVuZGVyIHRyZWUuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzLiBUaGlzIGlzIG5vdCB3ZWJmYWNpbmcsIHNvIHRoaXMgY2FuJ3QgYmUgdGVzdGVkIHdpdGhv dXQgYWRkaW5nCisgICAgICAgIEFQSSB0byBsYXlvdXQgdGVzdCBjb250cm9sbGVyLCB3aGljaCBk b2Vzbid0IHNlZW0gd29ydGggaXQgZm9yIHRoaXMgY29kZS4KKworICAgICAgICAqIHBhZ2UvUGFn ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjpyZW5kZXJUcmVlU2l6ZSk6CisgICAgICAg IChXZWJDb3JlOjpQYWdlOjpzZXRWaXNpYmlsaXR5U3RhdGUpOgorICAgICAgICAqIHBhZ2UvUGFn ZS5oOgorICAgICAgICAoUGFnZSk6CisgICAgICAgICogcGxhdGZvcm0vQXJlbmEuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6QXJlbmFBbGxvY2F0ZSk6CisgICAgICAgICogcGxhdGZvcm0vQXJlbmEu aDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJBcmVuYS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJBcmVuYTo6YWxsb2NhdGUpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJBcmVuYS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQXJlbmE6 OnRvdGFsUmVuZGVyQXJlbmFBbGxvY2F0ZWRCeXRlcyk6CisgICAgICAgIChSZW5kZXJBcmVuYSk6 CisKIDIwMTItMDUtMDMgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4QHdlYmtpdC5vcmc+ CiAKICAgICAgICAgQVNTRVJUKCFtX3pPcmRlckxpc3RzRGlydHkpIGlzIHRyaWdnZXJpbmcgaW4g U2FmYXJpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGU0Y2I0MTAxZDQwZmRkMWZiM2E0MzMxNjQ4MjkyMjljOWE5 NmUwYy4uYWIzMzBmMjMzYzY4OWY0ZGNiMGU0N2RkNWY5ZWEwZmJmNGQwOTE2NyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA1LTAzICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgSGlzdG9ncmFtIHRvdGFsIGFsbG9jYXRlZCBieXRlcyBpbiB0aGUg YXJlbmEgaW4gYWRkaXRpb24gdG8gdGhlIHJlbmRlciB0cmVlIHNpemUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg1NTM3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlbmRlclRyZWVTaXplKToKKwog MjAxMi0wNS0wMyAgVG9iaWFzIE5ldHplbCAgPHRvYmlhcy5uZXR6ZWxAZ29vZ2xlbWFpbC5jb20+ CiAKICAgICAgICAgQnVncyBpbiBXZWJGdWxsU2NyZWVuQ29udHJvbGxlcgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5j cHAKaW5kZXggN2M0NGM0NDAxMjZhMTY4NzJmNjEwNjkyN2Q4OTM2ZTE2NWFkOGE3Ny4uNjA3MTFi OTIyZDIzMTZhYjFhMDBmMGUyNWFhZDEwYjYxYWVjOTIzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCkBA IC0yMTAsMTQgKzIxMCwxOCBAQCBQYWdlOjp+UGFnZSgpCiAKIH0KIAotc2l6ZV90IFBhZ2U6OnJl bmRlclRyZWVTaXplKCkgY29uc3QKK0FyZW5hU2l6ZSBQYWdlOjpyZW5kZXJUcmVlU2l6ZSgpIGNv bnN0CiB7Ci0gICAgc2l6ZV90IHNpemUgPSAwOworICAgIEFyZW5hU2l6ZSB0b3RhbCgwLCAwKTsK ICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1haW5GcmFtZSgpOyBmcmFtZTsgZnJhbWUgPSBmcmFt ZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQoKSkgewotICAgICAgICBpZiAoZnJhbWUtPmRvY3VtZW50 KCkgJiYgZnJhbWUtPmRvY3VtZW50KCktPnJlbmRlckFyZW5hKCkpCi0gICAgICAgICAgICBzaXpl ICs9IGZyYW1lLT5kb2N1bWVudCgpLT5yZW5kZXJBcmVuYSgpLT50b3RhbFJlbmRlckFyZW5hU2l6 ZSgpOworICAgICAgICBpZiAoIWZyYW1lLT5kb2N1bWVudCgpKQorICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgIGlmIChSZW5kZXJBcmVuYSogYXJlbmEgPSBmcmFtZS0+ZG9jdW1lbnQoKS0+ cmVuZGVyQXJlbmEoKSkgeworICAgICAgICAgICAgdG90YWwudHJlZVNpemUgKz0gYXJlbmEtPnRv dGFsUmVuZGVyQXJlbmFTaXplKCk7CisgICAgICAgICAgICB0b3RhbC5hbGxvY2F0ZWQgKz0gYXJl bmEtPnRvdGFsUmVuZGVyQXJlbmFBbGxvY2F0ZWRCeXRlcygpOworICAgICAgICB9CiAgICAgfQot ICAgIHJldHVybiBzaXplOworICAgIHJldHVybiB0b3RhbDsKIH0KIAogVmlld3BvcnRBcmd1bWVu dHMgUGFnZTo6dmlld3BvcnRBcmd1bWVudHMoKSBjb25zdApAQCAtMTAyOSw4ICsxMDMzLDExIEBA IHZvaWQgUGFnZTo6c2V0VmlzaWJpbGl0eVN0YXRlKFBhZ2VWaXNpYmlsaXR5U3RhdGUgdmlzaWJp bGl0eVN0YXRlLCBib29sIGlzSW5pdGlhCiAgICAgbV92aXNpYmlsaXR5U3RhdGUgPSB2aXNpYmls aXR5U3RhdGU7CiAKICAgICBpZiAoIWlzSW5pdGlhbFN0YXRlICYmIG1fbWFpbkZyYW1lKSB7Ci0g ICAgICAgIGlmICh2aXNpYmlsaXR5U3RhdGUgPT0gUGFnZVZpc2liaWxpdHlTdGF0ZUhpZGRlbikK LSAgICAgICAgICAgIEhpc3RvZ3JhbVN1cHBvcnQ6Omhpc3RvZ3JhbUN1c3RvbUNvdW50cygiV2Vi Q29yZS5QYWdlLnJlbmRlclRyZWVTaXplQnl0ZXMiLCByZW5kZXJUcmVlU2l6ZSgpLCAxMDAwLCA1 MDAwMDAwMDAsIDUwKTsKKyAgICAgICAgaWYgKHZpc2liaWxpdHlTdGF0ZSA9PSBQYWdlVmlzaWJp bGl0eVN0YXRlSGlkZGVuKSB7CisgICAgICAgICAgICBBcmVuYVNpemUgc2l6ZSA9IHJlbmRlclRy ZWVTaXplKCk7CisgICAgICAgICAgICBIaXN0b2dyYW1TdXBwb3J0OjpoaXN0b2dyYW1DdXN0b21D b3VudHMoIldlYkNvcmUuUGFnZS5yZW5kZXJUcmVlU2l6ZUJ5dGVzIiwgc2l6ZS50cmVlU2l6ZSwg MTAwMCwgNTAwMDAwMDAwLCA1MCk7CisgICAgICAgICAgICBIaXN0b2dyYW1TdXBwb3J0OjpoaXN0 b2dyYW1DdXN0b21Db3VudHMoIldlYkNvcmUuUGFnZS5yZW5kZXJUcmVlQWxsb2NhdGVkQnl0ZXMi LCBzaXplLmFsbG9jYXRlZCwgMTAwMCwgNTAwMDAwMDAwLCA1MCk7CisgICAgICAgIH0KICAgICAg ICAgbV9tYWluRnJhbWUtPmRpc3BhdGNoVmlzaWJpbGl0eVN0YXRlQ2hhbmdlRXZlbnQoKTsKICAg ICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuaCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4IDAzYzdmZmRiYjU2ZWY2MTZjNjE4NWYwYTdjOWIxYWZh ZWI5NGNjZjAuLmI2ZGVkODI4M2VhYWYxMjVhYTI0Y2Q4ZWFlODA5Njg5YmIzZmYwMGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZS5oCkBAIC05MSw2ICs5MSwxNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICBm bG9hdCBkZXZpY2VTY2FsZUZhY3RvcihGcmFtZSopOwogCisgICAgc3RydWN0IEFyZW5hU2l6ZSB7 CisgICAgICAgIEFyZW5hU2l6ZShzaXplX3QgdHJlZVNpemUsIHNpemVfdCBhbGxvY2F0ZWQpCisg ICAgICAgICAgICA6IHRyZWVTaXplKHRyZWVTaXplKQorICAgICAgICAgICAgLCBhbGxvY2F0ZWQo YWxsb2NhdGVkKQorICAgICAgICB7CisgICAgICAgIH0KKyAgICAgICAgc2l6ZV90IHRyZWVTaXpl OworICAgICAgICBzaXplX3QgYWxsb2NhdGVkOworICAgIH07CisKICAgICBjbGFzcyBQYWdlIDog cHVibGljIFN1cHBsZW1lbnRhYmxlPFBhZ2U+IHsKICAgICAgICAgV1RGX01BS0VfTk9OQ09QWUFC TEUoUGFnZSk7CiAgICAgICAgIGZyaWVuZCBjbGFzcyBTZXR0aW5nczsKQEAgLTExOCw3ICsxMjgs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFBhZ2UoUGFnZUNsaWVudHMmKTsKICAg ICAgICAgflBhZ2UoKTsKIAotICAgICAgICBzaXplX3QgcmVuZGVyVHJlZVNpemUoKSBjb25zdDsK KyAgICAgICAgQXJlbmFTaXplIHJlbmRlclRyZWVTaXplKCkgY29uc3Q7CiAKICAgICAgICAgdm9p ZCBzZXROZWVkc1JlY2FsY1N0eWxlSW5BbGxGcmFtZXMoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vQXJlbmEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQXJl bmEuY3BwCmluZGV4IGYzMDVmMTY5MTRlN2ZiYjQ1NTZhOTA3ZWIxOWUzOWNhMDhhYmZjOWEuLjYw NjA5MjYyNjM3MGFlZDNhZTVmMTJmMzM0OTlhZGUzMjYxNDg3YTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL0FyZW5hLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9BcmVuYS5jcHAKQEAgLTk3LDcgKzk3LDcgQEAgdm9pZCBJbml0QXJlbmFQb29sKEFyZW5hUG9v bCogcG9vbCwgY29uc3QgY2hhciosIHVuc2lnbmVkIHNpemUsIHVuc2lnbmVkIGFsaWduKQogICAg ICBwb29sLT5hcmVuYXNpemUgPSBzaXplOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAKIH0KIAotdm9pZCogQXJlbmFBbGxvY2F0ZShBcmVuYVBvb2wqIHBvb2wsIHVuc2lnbmVkIGlu dCBudW1CeXRlcykKK3ZvaWQqIEFyZW5hQWxsb2NhdGUoQXJlbmFQb29sKiBwb29sLCB1bnNpZ25l ZCBpbnQgbnVtQnl0ZXMsIHVuc2lnbmVkIGludCYgYnl0ZXNBbGxvY2F0ZWQpCiB7CiAgICAgQXJl bmEqIGFyZW5hOwogICAgIGNoYXIqIHJldHVyblBvaW50ZXI7CkBAIC0xMjcsNiArMTI3LDcgQEAg dm9pZCogQXJlbmFBbGxvY2F0ZShBcmVuYVBvb2wqIHBvb2wsIHVuc2lnbmVkIGludCBudW1CeXRl cykKICAgICAgICAgaSsrOwogICAgICAgICBwcmludGYoIk1hbGxvYzogJWRcbiIsIGkpOwogI2Vu ZGlmCisgICAgICAgIGJ5dGVzQWxsb2NhdGVkID0gc2l6ZTsKICAgICAgICAgYXJlbmEgPSAoQXJl bmEqKWZhc3RNYWxsb2Moc2l6ZSk7CiAgICAgICAgIC8vIGZhc3RNYWxsb2Mgd2lsbCBhYm9ydCgp IGlmIGl0IGZhaWxzLCBzbyB3ZSBhcmUgZ3VhcmFudGVlZCB0aGF0IGEgaXMgbm90IDAuCiAgICAg ICAgIGFyZW5hLT5saW1pdCA9ICh1d29yZClhcmVuYSArIHNpemU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9BcmVuYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQXJl bmEuaAppbmRleCA5NmMzMWU1MDJkZDQzMmM0OGJhYzQ0MWYzN2M3ZDJiNjUzMjc1ZDY2Li5jMTE4 NWU0N2ZjNzAzMzVjMjY0M2M2MWY3NGUwMTc0YTA1ZTcyMzMyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9BcmVuYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0Fy ZW5hLmgKQEAgLTY5LDE3ICs2OSwxNyBAQCBzdHJ1Y3QgQXJlbmFQb29sIHsKIAogdm9pZCBJbml0 QXJlbmFQb29sKEFyZW5hUG9vbCosIGNvbnN0IGNoYXIqIG5hbWUsIHVuc2lnbmVkIGludCBzaXpl LCB1bnNpZ25lZCBpbnQgYWxpZ24pOwogdm9pZCBGaW5pc2hBcmVuYVBvb2woQXJlbmFQb29sKik7 Ci12b2lkKiBBcmVuYUFsbG9jYXRlKEFyZW5hUG9vbCosIHVuc2lnbmVkIGludCBuYik7Cit2b2lk KiBBcmVuYUFsbG9jYXRlKEFyZW5hUG9vbCosIHVuc2lnbmVkIGludCBudW1CeXRlcywgdW5zaWdu ZWQgaW50JiBieXRlc0FsbG9jYXRlZCk7CiAKICNkZWZpbmUgQVJFTkFfQUxJR04obikgKCgodXdv cmQpKG4pICsgQVJFTkFfQUxJR05fTUFTSykgJiB+QVJFTkFfQUxJR05fTUFTSykKICNkZWZpbmUg SU5JVF9BUkVOQV9QT09MKHBvb2wsIG5hbWUsIHNpemUpIEluaXRBcmVuYVBvb2wocG9vbCwgbmFt ZSwgc2l6ZSwgQVJFTkFfQUxJR05fTUFTSyArIDEpCi0jZGVmaW5lIEFSRU5BX0FMTE9DQVRFKHAs IHBvb2wsIG5iKSBcCisjZGVmaW5lIEFSRU5BX0FMTE9DQVRFKHAsIHBvb2wsIG5iLCBieXRlc0Fs bG9jYXRlZCkgXAogICAgIEFyZW5hKiBfYSA9IChwb29sKS0+Y3VycmVudDsgXAogICAgIHVuc2ln bmVkIGludCBfbmIgPSBBUkVOQV9BTElHTihuYik7IFwKICAgICB1d29yZCBfcCA9IF9hLT5hdmFp bDsgXAogICAgIHV3b3JkIF9xID0gX3AgKyBfbmI7IFwKICAgICBpZiAoX3EgPiBfYS0+bGltaXQp IFwKLSAgICAgICAgX3AgPSAodXdvcmQpQXJlbmFBbGxvY2F0ZShwb29sLCBfbmIpOyBcCisgICAg ICAgIF9wID0gKHV3b3JkKUFyZW5hQWxsb2NhdGUocG9vbCwgX25iLCAqYnl0ZXNBbGxvY2F0ZWQp OyBcCiAgICAgZWxzZSBcCiAgICAgICAgIF9hLT5hdmFpbCA9IF9xOyBcCiAgICAgcCA9ICh2b2lk KilfcDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJBcmVuYS5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQXJlbmEuY3BwCmluZGV4IDZjNGM1 ZGMxNTE1NDgzNjllNTc4YTYzNTAwOWRiMzM3ZDBiNjMxNDUuLmIwMWY2NWRkZDVmNDZhNDZlMjE4 YzM4ZTBiMjE0ODNhN2E3YmJjNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJBcmVuYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckFy ZW5hLmNwcApAQCAtMTEwLDcgKzExMCw5IEBAIHZvaWQqIFJlbmRlckFyZW5hOjphbGxvY2F0ZShz aXplX3Qgc2l6ZSkKIAogICAgIGlmICghcmVzdWx0KSB7CiAgICAgICAgIC8vIEFsbG9jYXRlIGEg bmV3IGNodW5rIGZyb20gdGhlIGFyZW5hCi0gICAgICAgIEFSRU5BX0FMTE9DQVRFKHJlc3VsdCwg Jm1fcG9vbCwgc2l6ZSk7CisgICAgICAgIHVuc2lnbmVkIGJ5dGVzQWxsb2NhdGVkID0gMDsKKyAg ICAgICAgQVJFTkFfQUxMT0NBVEUocmVzdWx0LCAmbV9wb29sLCBzaXplLCAmYnl0ZXNBbGxvY2F0 ZWQpOworICAgICAgICBtX3RvdGFsQWxsb2NhdGVkICs9IGJ5dGVzQWxsb2NhdGVkOwogICAgIH0K IAogICAgIHJldHVybiByZXN1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQXJlbmEuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJBcmVuYS5o CmluZGV4IDkxNTBlNzEzNTIyMjRmYTQ1NDZiMDAzNWIxYWRhNmJlZTE3NTg2ZTcuLjBiNjRlMTg3 Nzg1NzVmMzRjOTY2OGNjZmYwZjgyYzUzYjU4Y2JlOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJBcmVuYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJBcmVuYS5oCkBAIC01NCw2ICs1NCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGZyZWUo c2l6ZV90LCB2b2lkKik7CiAKICAgICBzaXplX3QgdG90YWxSZW5kZXJBcmVuYVNpemUoKSBjb25z dCB7IHJldHVybiBtX3RvdGFsU2l6ZTsgfQorICAgIHNpemVfdCB0b3RhbFJlbmRlckFyZW5hQWxs b2NhdGVkQnl0ZXMoKSBjb25zdCB7IHJldHVybiBtX3RvdGFsQWxsb2NhdGVkOyB9CiAKIHByaXZh dGU6CiAgICAgLy8gVW5kZXJseWluZyBhcmVuYSBwb29sCkBAIC02NCw2ICs2NSw3IEBAIHByaXZh dGU6CiAgICAgdm9pZCogbV9yZWN5Y2xlcnNbZ01heFJlY3ljbGVkU2l6ZSA+PiAyXTsKIAogICAg IHNpemVfdCBtX3RvdGFsU2l6ZTsKKyAgICBzaXplX3QgbV90b3RhbEFsbG9jYXRlZDsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcAppbmRleCAxNDVjZDgyNWRkMDEwYzI5NjdiMTQ0YjNiM2RjOTAwMDVm YjMyMjJkLi4zODgzYTVjN2FhNmViNzBhMmRhZmI3Y2M5MzIwMjNjYTBhNDBmMmQyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC01MDEsNyAr NTAxLDcgQEAgdWludDY0X3QgV2ViUGFnZTo6cmVuZGVyVHJlZVNpemUoKSBjb25zdAogewogICAg IGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gbV9wYWdlLT5yZW5k ZXJUcmVlU2l6ZSgpOworICAgIHJldHVybiBtX3BhZ2UtPnJlbmRlclRyZWVTaXplKCkudHJlZVNp emU7CiB9CiAKIHZvaWQgV2ViUGFnZTo6c2V0UGFpbnRlZE9iamVjdHNDb3VudGVyVGhyZXNob2xk KHVpbnQ2NF90IHRocmVzaG9sZCkK