85393 2012-05-02 11:22:26 -0700 Convert FractionalLayoutUnit overflow assertions to stderr warnings 2012-05-02 19:00:57 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw eae eric webkit.review.bot oldest_to_newest 614466 0 leviw 2012-05-02 11:22:26 -0700 It's quite useful to be aware when overflows are occurring, but it's not always a programming error. With this change, we'll write to stderr on debug builds when an overflow occurs, but not crash. 614473 1 139845 leviw 2012-05-02 11:29:19 -0700 Created attachment 139845 Patch 614488 2 139845 eric 2012-05-02 11:47:49 -0700 Comment on attachment 139845 Patch Hmm... I suspect many callers will be surprised by overflow. I wonder if we need to have these taken an Enum instead, which is AllowOverflow and ASSERT when we overflow and that enum is false (default). Then we could white-list the test cases we care about? I feel like these stderr logs will mostly just get lost. 614744 3 eric 2012-05-02 15:53:01 -0700 I thought you planned to do the stdout version? 614749 4 leviw 2012-05-02 15:55:58 -0700 (In reply to comment #3) > I thought you planned to do the stdout version? Sorry, I did and landed it in our branch but forgot to upload it! 614760 5 139903 leviw 2012-05-02 16:06:14 -0700 Created attachment 139903 Patch 614768 6 139903 eric 2012-05-02 16:09:45 -0700 Comment on attachment 139903 Patch OK. This seems like the best we've come up with so far. The big question remaining is what to do with the tests which now only fail in Debug mode. If any of those are ever *supposed* to trigger overflow, they'll now never be able to pass in both Debug/Release which is bad. If there exist such tests, then it seems we'll need to move this back to stderr. 614774 7 leviw 2012-05-02 16:15:03 -0700 (In reply to comment #6) > (From update of attachment 139903 [details]) > OK. This seems like the best we've come up with so far. The big question remaining is what to do with the tests which now only fail in Debug mode. If any of those are ever *supposed* to trigger overflow, they'll now never be able to pass in both Debug/Release which is bad. If there exist such tests, then it seems we'll need to move this back to stderr. Agreed. The majority of tests that trigger this is the result of bug 68744, which is incorrect behavior. 614819 8 139903 buildbot 2012-05-02 16:48:32 -0700 Comment on attachment 139903 Patch Attachment 139903 did not pass win-ews (win): Output: http://queues.webkit.org/results/12613082 614827 9 leviw 2012-05-02 16:56:22 -0700 Going back to stderr after talking with eseidel on irc. 614832 10 139919 leviw 2012-05-02 17:04:04 -0700 Created attachment 139919 Patch 614845 11 139919 eric 2012-05-02 17:18:13 -0700 Comment on attachment 139919 Patch Thanks. 614933 12 139919 webkit.review.bot 2012-05-02 19:00:46 -0700 Comment on attachment 139919 Patch Clearing flags on attachment: 139919 Committed r115928: <http://trac.webkit.org/changeset/115928> 614934 13 webkit.review.bot 2012-05-02 19:00:57 -0700 All reviewed patches have been landed. Closing bug. 139845 2012-05-02 11:29:19 -0700 2012-05-02 16:06:06 -0700 Patch bug-85393-20120502112918.patch text/plain 4075 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTg1NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA1LTAyICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBDb252ZXJ0IEZyYWN0aW9u YWxMYXlvdXRVbml0IG92ZXJmbG93IGFzc2VydGlvbnMgdG8gc3RkZXJyIHdhcm5pbmdzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTM5MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdyaXRpbmcgd2Fybmlu Z3MgdG8gc3RkZXJyIHdoZW4gRnJhY3Rpb25hbExheW91dFVuaXRzIG92ZXJmbG93IG9uIGRlYnVn IGJ1aWxkcyBpbnN0ZWFkIG9mIGFzc2VydGluZworICAgICAgICBhbmQgY3Jhc2hpbmcuIEl0IGNh biBiZSB2ZXJ5IHVzZWZ1bCB0byBXZWJLaXQgZGV2ZWxvcGVycyBrbm93IHdoZW4gb3ZlcmZsb3cg aXMgb2NjdXJyaW5nLCBidXQgaXQncworICAgICAgICBub3QgYWx3YXlzIGEgcHJvZ3JhbW1pbmcg ZXJyb3IsIHNvIGFzc2VydCB3YXNuJ3QgdGhlIHJpZ2h0IGFjdGlvbi4KKworICAgICAgICBObyBu ZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL0Zy YWN0aW9uYWxMYXlvdXRVbml0Lmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OkZyYWN0aW9uYWxMYXlvdXRVbml0OjpGcmFjdGlvbmFsTGF5b3V0VW5pdCk6CisgICAgICAg IChXZWJDb3JlOjpGcmFjdGlvbmFsTGF5b3V0VW5pdDo6dG9VbnNpZ25lZCk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFjdGlvbmFsTGF5b3V0VW5pdDo6c2V0UmF3VmFsdWUpOgorCiAyMDEyLTA1LTAy ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RL XSBDb21waWxhdGlvbiB3YXJuaW5ncyBpbiBSZW5kZXJUaGVtZQpJbmRleDogU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vRnJhY3Rpb25hbExheW91dFVuaXQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9GcmFjdGlvbmFsTGF5b3V0VW5pdC5oCShyZXZpc2lvbiAxMTU4NTEp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9GcmFjdGlvbmFsTGF5b3V0VW5pdC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zOCw2ICszOCwyMCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKyNp ZmRlZiBOREVCVUcKKworI2RlZmluZSBSRVBPUlRfT1ZFUkZMT1coZG9lc092ZXJmbG93KSAoKHZv aWQpMCkKKworI2Vsc2UKKworI2RlZmluZSBSRVBPUlRfT1ZFUkZMT1coZG9lc092ZXJmbG93KSBk byBcCisgICAgaWYgKCEoZG9lc092ZXJmbG93KSkgeyBcCisgICAgICAgIFdURlJlcG9ydEVycm9y KF9fRklMRV9fLCBfX0xJTkVfXywgV1RGX1BSRVRUWV9GVU5DVElPTiwgIiEoJXMpIiwgI2RvZXNP dmVyZmxvdyk7IFwKKyAgICB9IFwKK3doaWxlICgwKQorCisjZW5kaWYKKwogI2lmIEVOQUJMRShT VUJQSVhFTF9MQVlPVVQpCiBzdGF0aWMgY29uc3QgaW50IGtGaXhlZFBvaW50RGVub21pbmF0b3Ig PSA2MDsKICNlbHNlCkBAIC01MywxNSArNjcsMTUgQEAgcHVibGljOgogICAgIC8vIFNlZSBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM4NDggZm9yIGRldGFpbHMuCiAg ICAgCiAgICAgRnJhY3Rpb25hbExheW91dFVuaXQoKSA6IG1fdmFsdWUoMCkgeyB9Ci0gICAgRnJh Y3Rpb25hbExheW91dFVuaXQoaW50IHZhbHVlKSB7IEFTU0VSVChpc0luQm91bmRzKHZhbHVlKSk7 IG1fdmFsdWUgPSB2YWx1ZSAqIGtGaXhlZFBvaW50RGVub21pbmF0b3I7IH0KLSAgICBGcmFjdGlv bmFsTGF5b3V0VW5pdCh1bnNpZ25lZCBzaG9ydCB2YWx1ZSkgeyBBU1NFUlQoaXNJbkJvdW5kcyh2 YWx1ZSkpOyBtX3ZhbHVlID0gdmFsdWUgKiBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9Ci0gICAg RnJhY3Rpb25hbExheW91dFVuaXQodW5zaWduZWQgaW50IHZhbHVlKSB7IEFTU0VSVChpc0luQm91 bmRzKHZhbHVlKSk7IG1fdmFsdWUgPSB2YWx1ZSAqIGtGaXhlZFBvaW50RGVub21pbmF0b3I7IH0K LSAgICBGcmFjdGlvbmFsTGF5b3V0VW5pdChmbG9hdCB2YWx1ZSkgeyBBU1NFUlQoaXNJbkJvdW5k cyh2YWx1ZSkpOyBtX3ZhbHVlID0gdmFsdWUgKiBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9Ci0g ICAgRnJhY3Rpb25hbExheW91dFVuaXQoZG91YmxlIHZhbHVlKSB7IEFTU0VSVChpc0luQm91bmRz KHZhbHVlKSk7IG1fdmFsdWUgPSB2YWx1ZSAqIGtGaXhlZFBvaW50RGVub21pbmF0b3I7IH0KKyAg ICBGcmFjdGlvbmFsTGF5b3V0VW5pdChpbnQgdmFsdWUpIHsgUkVQT1JUX09WRVJGTE9XKGlzSW5C b3VuZHModmFsdWUpKTsgbV92YWx1ZSA9IHZhbHVlICoga0ZpeGVkUG9pbnREZW5vbWluYXRvcjsg fQorICAgIEZyYWN0aW9uYWxMYXlvdXRVbml0KHVuc2lnbmVkIHNob3J0IHZhbHVlKSB7IFJFUE9S VF9PVkVSRkxPVyhpc0luQm91bmRzKHZhbHVlKSk7IG1fdmFsdWUgPSB2YWx1ZSAqIGtGaXhlZFBv aW50RGVub21pbmF0b3I7IH0KKyAgICBGcmFjdGlvbmFsTGF5b3V0VW5pdCh1bnNpZ25lZCBpbnQg dmFsdWUpIHsgUkVQT1JUX09WRVJGTE9XKGlzSW5Cb3VuZHModmFsdWUpKTsgbV92YWx1ZSA9IHZh bHVlICoga0ZpeGVkUG9pbnREZW5vbWluYXRvcjsgfQorICAgIEZyYWN0aW9uYWxMYXlvdXRVbml0 KGZsb2F0IHZhbHVlKSB7IFJFUE9SVF9PVkVSRkxPVyhpc0luQm91bmRzKHZhbHVlKSk7IG1fdmFs dWUgPSB2YWx1ZSAqIGtGaXhlZFBvaW50RGVub21pbmF0b3I7IH0KKyAgICBGcmFjdGlvbmFsTGF5 b3V0VW5pdChkb3VibGUgdmFsdWUpIHsgUkVQT1JUX09WRVJGTE9XKGlzSW5Cb3VuZHModmFsdWUp KTsgbV92YWx1ZSA9IHZhbHVlICoga0ZpeGVkUG9pbnREZW5vbWluYXRvcjsgfQogICAgIEZyYWN0 aW9uYWxMYXlvdXRVbml0KGNvbnN0IEZyYWN0aW9uYWxMYXlvdXRVbml0JiB2YWx1ZSkgeyBtX3Zh bHVlID0gdmFsdWUucmF3VmFsdWUoKTsgfQogCiAgICAgaW5saW5lIGludCB0b0ludCgpIGNvbnN0 IHsgcmV0dXJuIG1fdmFsdWUgLyBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9Ci0gICAgaW5saW5l IHVuc2lnbmVkIHRvVW5zaWduZWQoKSBjb25zdCB7IEFTU0VSVChtX3ZhbHVlID49IDApOyByZXR1 cm4gdG9JbnQoKTsgfQorICAgIGlubGluZSB1bnNpZ25lZCB0b1Vuc2lnbmVkKCkgY29uc3QgeyBS RVBPUlRfT1ZFUkZMT1cobV92YWx1ZSA+PSAwKTsgcmV0dXJuIHRvSW50KCk7IH0KICAgICBpbmxp bmUgZmxvYXQgdG9GbG9hdCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PGZsb2F0PihtX3Zh bHVlKSAvIGtGaXhlZFBvaW50RGVub21pbmF0b3I7IH0KICAgICBpbmxpbmUgZG91YmxlIHRvRG91 YmxlKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8ZG91YmxlPihtX3ZhbHVlKSAvIGtGaXhl ZFBvaW50RGVub21pbmF0b3I7IH0KIApAQCAtODEsNyArOTUsNyBAQCBwdWJsaWM6CiAgICAgaW5s aW5lIHZvaWQgc2V0UmF3VmFsdWUoaW50IHZhbHVlKSB7IG1fdmFsdWUgPSB2YWx1ZTsgfQogICAg IGlubGluZSB2b2lkIHNldFJhd1ZhbHVlKGxvbmcgbG9uZyB2YWx1ZSkKICAgICB7Ci0gICAgICAg IEFTU0VSVCh2YWx1ZSA+IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6bWluKCkgJiYgdmFsdWUg PCBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1heCgpKTsKKyAgICAgICAgUkVQT1JUX09WRVJG TE9XKHZhbHVlID4gc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptaW4oKSAmJiB2YWx1ZSA8IHN0 ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6bWF4KCkpOwogICAgICAgICBtX3ZhbHVlID0gc3RhdGlj X2Nhc3Q8aW50Pih2YWx1ZSk7CiAgICAgfQogCg== 139903 2012-05-02 16:06:14 -0700 2012-05-02 17:04:00 -0700 Patch bug-85393-20120502160612.patch text/plain 4256 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTkwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEyLTA1LTAyICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBDb252ZXJ0IEZyYWN0aW9u YWxMYXlvdXRVbml0IG92ZXJmbG93IGFzc2VydGlvbnMgdG8gc3Rkb3V0IHdhcm5pbmdzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTM5MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdyaXRpbmcgd2Fybmlu Z3MgdG8gc3Rkb3V0IHdoZW4gRnJhY3Rpb25hbExheW91dFVuaXRzIG92ZXJmbG93IG9uIGRlYnVn IGJ1aWxkcyBpbnN0ZWFkIG9mIGFzc2VydGluZworICAgICAgICBhbmQgY3Jhc2hpbmcuIEl0IGNh biBiZSB2ZXJ5IHVzZWZ1bCB0byBXZWJLaXQgZGV2ZWxvcGVycyBrbm93IHdoZW4gb3ZlcmZsb3cg aXMgb2NjdXJyaW5nLCBidXQgaXQncworICAgICAgICBub3QgYWx3YXlzIGEgcHJvZ3JhbW1pbmcg ZXJyb3IsIHNvIGFzc2VydCB3YXNuJ3QgdGhlIHJpZ2h0IGFjdGlvbi4gU2luY2UgdGhpcyB3cml0 ZXMgdG8gc3Rkb3V0LAorICAgICAgICBEZXZzIGNhbid0IGlnbm9yZSB0aGlzIG9jY3VycmVuY2Ug YXMgaXQnbGwgYmUgcHJlc2VudCBpbiB0ZXN0IHJlc3VsdHMgb24gZGVidWcgYnVpbGRzLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAgICog cGxhdGZvcm0vRnJhY3Rpb25hbExheW91dFVuaXQuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAg ICAgICAoV2ViQ29yZTo6RnJhY3Rpb25hbExheW91dFVuaXQ6OkZyYWN0aW9uYWxMYXlvdXRVbml0 KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYWN0aW9uYWxMYXlvdXRVbml0Ojp0b1Vuc2lnbmVkKToK KyAgICAgICAgKFdlYkNvcmU6OkZyYWN0aW9uYWxMYXlvdXRVbml0OjpzZXRSYXdWYWx1ZSk6CisK IDIwMTItMDUtMDIgIEFkYW0gS2xlaW4gIDxhZGFta0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg Q2hpbGRsaXN0IG11dGF0aW9ucyBpbiBzaGFkb3cgRE9NIHNob3VsZCBiZSBvYnNlcnZhYmxlIHdp dGggTXV0YXRpb25PYnNlcnZlcnMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZyYWN0 aW9uYWxMYXlvdXRVbml0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v RnJhY3Rpb25hbExheW91dFVuaXQuaAkocmV2aXNpb24gMTE1OTAxKQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vRnJhY3Rpb25hbExheW91dFVuaXQuaAkod29ya2luZyBjb3B5KQpAQCAtMzgs NiArMzgsMjAgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCisjaWZkZWYgTkRFQlVHCisKKyNk ZWZpbmUgUkVQT1JUX09WRVJGTE9XKGRvZXNPdmVyZmxvdykgKCh2b2lkKTApCisKKyNlbHNlCisK KyNkZWZpbmUgUkVQT1JUX09WRVJGTE9XKGRvZXNPdmVyZmxvdykgZG8gXAorICAgIGlmICghKGRv ZXNPdmVyZmxvdykpIHsgXAorICAgICAgICBwcmludGYoIkZyYWN0aW9uYWxMYXlvdXRVbml0IG92 ZXJmbG93IGRldGVjdGVkIGluICVzKCVkKSA6ICVzXG4iLCBfX0ZJTEVfXywgX19MSU5FX18sIFdU Rl9QUkVUVFlfRlVOQ1RJT04pOyBcCisgICAgfSBcCit3aGlsZSAoMCkKKworI2VuZGlmCisKICNp ZiBFTkFCTEUoU1VCUElYRUxfTEFZT1VUKQogc3RhdGljIGNvbnN0IGludCBrRml4ZWRQb2ludERl bm9taW5hdG9yID0gNjA7CiAjZWxzZQpAQCAtNTMsMTUgKzY3LDE1IEBAIHB1YmxpYzoKICAgICAv LyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzODQ4IGZvciBk ZXRhaWxzLgogICAgIAogICAgIEZyYWN0aW9uYWxMYXlvdXRVbml0KCkgOiBtX3ZhbHVlKDApIHsg fQotICAgIEZyYWN0aW9uYWxMYXlvdXRVbml0KGludCB2YWx1ZSkgeyBBU1NFUlQoaXNJbkJvdW5k cyh2YWx1ZSkpOyBtX3ZhbHVlID0gdmFsdWUgKiBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9Ci0g ICAgRnJhY3Rpb25hbExheW91dFVuaXQodW5zaWduZWQgc2hvcnQgdmFsdWUpIHsgQVNTRVJUKGlz SW5Cb3VuZHModmFsdWUpKTsgbV92YWx1ZSA9IHZhbHVlICoga0ZpeGVkUG9pbnREZW5vbWluYXRv cjsgfQotICAgIEZyYWN0aW9uYWxMYXlvdXRVbml0KHVuc2lnbmVkIGludCB2YWx1ZSkgeyBBU1NF UlQoaXNJbkJvdW5kcyh2YWx1ZSkpOyBtX3ZhbHVlID0gdmFsdWUgKiBrRml4ZWRQb2ludERlbm9t aW5hdG9yOyB9Ci0gICAgRnJhY3Rpb25hbExheW91dFVuaXQoZmxvYXQgdmFsdWUpIHsgQVNTRVJU KGlzSW5Cb3VuZHModmFsdWUpKTsgbV92YWx1ZSA9IHZhbHVlICoga0ZpeGVkUG9pbnREZW5vbWlu YXRvcjsgfQotICAgIEZyYWN0aW9uYWxMYXlvdXRVbml0KGRvdWJsZSB2YWx1ZSkgeyBBU1NFUlQo aXNJbkJvdW5kcyh2YWx1ZSkpOyBtX3ZhbHVlID0gdmFsdWUgKiBrRml4ZWRQb2ludERlbm9taW5h dG9yOyB9CisgICAgRnJhY3Rpb25hbExheW91dFVuaXQoaW50IHZhbHVlKSB7IFJFUE9SVF9PVkVS RkxPVyhpc0luQm91bmRzKHZhbHVlKSk7IG1fdmFsdWUgPSB2YWx1ZSAqIGtGaXhlZFBvaW50RGVu b21pbmF0b3I7IH0KKyAgICBGcmFjdGlvbmFsTGF5b3V0VW5pdCh1bnNpZ25lZCBzaG9ydCB2YWx1 ZSkgeyBSRVBPUlRfT1ZFUkZMT1coaXNJbkJvdW5kcyh2YWx1ZSkpOyBtX3ZhbHVlID0gdmFsdWUg KiBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9CisgICAgRnJhY3Rpb25hbExheW91dFVuaXQodW5z aWduZWQgaW50IHZhbHVlKSB7IFJFUE9SVF9PVkVSRkxPVyhpc0luQm91bmRzKHZhbHVlKSk7IG1f dmFsdWUgPSB2YWx1ZSAqIGtGaXhlZFBvaW50RGVub21pbmF0b3I7IH0KKyAgICBGcmFjdGlvbmFs TGF5b3V0VW5pdChmbG9hdCB2YWx1ZSkgeyBSRVBPUlRfT1ZFUkZMT1coaXNJbkJvdW5kcyh2YWx1 ZSkpOyBtX3ZhbHVlID0gdmFsdWUgKiBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9CisgICAgRnJh Y3Rpb25hbExheW91dFVuaXQoZG91YmxlIHZhbHVlKSB7IFJFUE9SVF9PVkVSRkxPVyhpc0luQm91 bmRzKHZhbHVlKSk7IG1fdmFsdWUgPSB2YWx1ZSAqIGtGaXhlZFBvaW50RGVub21pbmF0b3I7IH0K ICAgICBGcmFjdGlvbmFsTGF5b3V0VW5pdChjb25zdCBGcmFjdGlvbmFsTGF5b3V0VW5pdCYgdmFs dWUpIHsgbV92YWx1ZSA9IHZhbHVlLnJhd1ZhbHVlKCk7IH0KIAogICAgIGlubGluZSBpbnQgdG9J bnQoKSBjb25zdCB7IHJldHVybiBtX3ZhbHVlIC8ga0ZpeGVkUG9pbnREZW5vbWluYXRvcjsgfQot ICAgIGlubGluZSB1bnNpZ25lZCB0b1Vuc2lnbmVkKCkgY29uc3QgeyBBU1NFUlQobV92YWx1ZSA+ PSAwKTsgcmV0dXJuIHRvSW50KCk7IH0KKyAgICBpbmxpbmUgdW5zaWduZWQgdG9VbnNpZ25lZCgp IGNvbnN0IHsgUkVQT1JUX09WRVJGTE9XKG1fdmFsdWUgPj0gMCk7IHJldHVybiB0b0ludCgpOyB9 CiAgICAgaW5saW5lIGZsb2F0IHRvRmxvYXQoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxm bG9hdD4obV92YWx1ZSkgLyBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9CiAgICAgaW5saW5lIGRv dWJsZSB0b0RvdWJsZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PGRvdWJsZT4obV92YWx1 ZSkgLyBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9CiAKQEAgLTgxLDcgKzk1LDcgQEAgcHVibGlj OgogICAgIGlubGluZSB2b2lkIHNldFJhd1ZhbHVlKGludCB2YWx1ZSkgeyBtX3ZhbHVlID0gdmFs dWU7IH0KICAgICBpbmxpbmUgdm9pZCBzZXRSYXdWYWx1ZShsb25nIGxvbmcgdmFsdWUpCiAgICAg ewotICAgICAgICBBU1NFUlQodmFsdWUgPiBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1pbigp ICYmIHZhbHVlIDwgc3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptYXgoKSk7CisgICAgICAgIFJF UE9SVF9PVkVSRkxPVyh2YWx1ZSA+IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6bWluKCkgJiYg dmFsdWUgPCBzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1heCgpKTsKICAgICAgICAgbV92YWx1 ZSA9IHN0YXRpY19jYXN0PGludD4odmFsdWUpOwogICAgIH0KIAo= 139919 2012-05-02 17:04:04 -0700 2012-05-02 19:00:46 -0700 Patch bug-85393-20120502170403.patch text/plain 4117 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNTkxMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA1LTAyICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBDb252ZXJ0IEZyYWN0aW9u YWxMYXlvdXRVbml0IG92ZXJmbG93IGFzc2VydGlvbnMgdG8gc3RkZXJyIHdhcm5pbmdzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTM5MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdyaXRpbmcgd2Fybmlu Z3MgdG8gc3RkZXJyIHdoZW4gRnJhY3Rpb25hbExheW91dFVuaXRzIG92ZXJmbG93IG9uIGRlYnVn IGJ1aWxkcyBpbnN0ZWFkIG9mIGFzc2VydGluZworICAgICAgICBhbmQgY3Jhc2hpbmcuIEl0IGNh biBiZSB2ZXJ5IHVzZWZ1bCB0byBXZWJLaXQgZGV2ZWxvcGVycyBrbm93IHdoZW4gb3ZlcmZsb3cg aXMgb2NjdXJyaW5nLCBidXQgaXQncworICAgICAgICBub3QgYWx3YXlzIGEgcHJvZ3JhbW1pbmcg ZXJyb3IsIHNvIGFzc2VydCB3YXNuJ3QgdGhlIHJpZ2h0IGFjdGlvbi4KKworICAgICAgICBObyBu ZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIHBsYXRmb3JtL0Zy YWN0aW9uYWxMYXlvdXRVbml0Lmg6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OkZyYWN0aW9uYWxMYXlvdXRVbml0OjpGcmFjdGlvbmFsTGF5b3V0VW5pdCk6CisgICAgICAg IChXZWJDb3JlOjpGcmFjdGlvbmFsTGF5b3V0VW5pdDo6dG9VbnNpZ25lZCk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFjdGlvbmFsTGF5b3V0VW5pdDo6c2V0UmF3VmFsdWUpOgorCiAyMDEyLTA1LTAy ICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgogCiAgICAgICAgIEFk ZCBBU1NFUlRzIHRvIGF2b2lkIHF1ZXJ5aW5nIGRpcnRpZWQgei1pbmRleCBvciBub3JtYWwgZmxv dyBsaXN0cyBvbiBSZW5kZXJMYXllcgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRnJh Y3Rpb25hbExheW91dFVuaXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9GcmFjdGlvbmFsTGF5b3V0VW5pdC5oCShyZXZpc2lvbiAxMTU5MTMpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9GcmFjdGlvbmFsTGF5b3V0VW5pdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0z OCw2ICszOCwyMCBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKyNpZmRlZiBOREVCVUcKKwor I2RlZmluZSBSRVBPUlRfT1ZFUkZMT1coZG9lc092ZXJmbG93KSAoKHZvaWQpMCkKKworI2Vsc2UK KworI2RlZmluZSBSRVBPUlRfT1ZFUkZMT1coZG9lc092ZXJmbG93KSBkbyBcCisgICAgaWYgKCEo ZG9lc092ZXJmbG93KSkgeyBcCisgICAgICAgIFdURlJlcG9ydEVycm9yKF9fRklMRV9fLCBfX0xJ TkVfXywgV1RGX1BSRVRUWV9GVU5DVElPTiwgIiEoJXMpIiwgI2RvZXNPdmVyZmxvdyk7IFwKKyAg ICB9IFwKK3doaWxlICgwKQorCisjZW5kaWYKKwogI2lmIEVOQUJMRShTVUJQSVhFTF9MQVlPVVQp CiBzdGF0aWMgY29uc3QgaW50IGtGaXhlZFBvaW50RGVub21pbmF0b3IgPSA2MDsKICNlbHNlCkBA IC01MywxNSArNjcsMTUgQEAgcHVibGljOgogICAgIC8vIFNlZSBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM4NDggZm9yIGRldGFpbHMuCiAgICAgCiAgICAgRnJhY3Rp b25hbExheW91dFVuaXQoKSA6IG1fdmFsdWUoMCkgeyB9Ci0gICAgRnJhY3Rpb25hbExheW91dFVu aXQoaW50IHZhbHVlKSB7IEFTU0VSVChpc0luQm91bmRzKHZhbHVlKSk7IG1fdmFsdWUgPSB2YWx1 ZSAqIGtGaXhlZFBvaW50RGVub21pbmF0b3I7IH0KLSAgICBGcmFjdGlvbmFsTGF5b3V0VW5pdCh1 bnNpZ25lZCBzaG9ydCB2YWx1ZSkgeyBBU1NFUlQoaXNJbkJvdW5kcyh2YWx1ZSkpOyBtX3ZhbHVl ID0gdmFsdWUgKiBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9Ci0gICAgRnJhY3Rpb25hbExheW91 dFVuaXQodW5zaWduZWQgaW50IHZhbHVlKSB7IEFTU0VSVChpc0luQm91bmRzKHZhbHVlKSk7IG1f dmFsdWUgPSB2YWx1ZSAqIGtGaXhlZFBvaW50RGVub21pbmF0b3I7IH0KLSAgICBGcmFjdGlvbmFs TGF5b3V0VW5pdChmbG9hdCB2YWx1ZSkgeyBBU1NFUlQoaXNJbkJvdW5kcyh2YWx1ZSkpOyBtX3Zh bHVlID0gdmFsdWUgKiBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9Ci0gICAgRnJhY3Rpb25hbExh eW91dFVuaXQoZG91YmxlIHZhbHVlKSB7IEFTU0VSVChpc0luQm91bmRzKHZhbHVlKSk7IG1fdmFs dWUgPSB2YWx1ZSAqIGtGaXhlZFBvaW50RGVub21pbmF0b3I7IH0KKyAgICBGcmFjdGlvbmFsTGF5 b3V0VW5pdChpbnQgdmFsdWUpIHsgUkVQT1JUX09WRVJGTE9XKGlzSW5Cb3VuZHModmFsdWUpKTsg bV92YWx1ZSA9IHZhbHVlICoga0ZpeGVkUG9pbnREZW5vbWluYXRvcjsgfQorICAgIEZyYWN0aW9u YWxMYXlvdXRVbml0KHVuc2lnbmVkIHNob3J0IHZhbHVlKSB7IFJFUE9SVF9PVkVSRkxPVyhpc0lu Qm91bmRzKHZhbHVlKSk7IG1fdmFsdWUgPSB2YWx1ZSAqIGtGaXhlZFBvaW50RGVub21pbmF0b3I7 IH0KKyAgICBGcmFjdGlvbmFsTGF5b3V0VW5pdCh1bnNpZ25lZCBpbnQgdmFsdWUpIHsgUkVQT1JU X09WRVJGTE9XKGlzSW5Cb3VuZHModmFsdWUpKTsgbV92YWx1ZSA9IHZhbHVlICoga0ZpeGVkUG9p bnREZW5vbWluYXRvcjsgfQorICAgIEZyYWN0aW9uYWxMYXlvdXRVbml0KGZsb2F0IHZhbHVlKSB7 IFJFUE9SVF9PVkVSRkxPVyhpc0luQm91bmRzKHZhbHVlKSk7IG1fdmFsdWUgPSB2YWx1ZSAqIGtG aXhlZFBvaW50RGVub21pbmF0b3I7IH0KKyAgICBGcmFjdGlvbmFsTGF5b3V0VW5pdChkb3VibGUg dmFsdWUpIHsgUkVQT1JUX09WRVJGTE9XKGlzSW5Cb3VuZHModmFsdWUpKTsgbV92YWx1ZSA9IHZh bHVlICoga0ZpeGVkUG9pbnREZW5vbWluYXRvcjsgfQogICAgIEZyYWN0aW9uYWxMYXlvdXRVbml0 KGNvbnN0IEZyYWN0aW9uYWxMYXlvdXRVbml0JiB2YWx1ZSkgeyBtX3ZhbHVlID0gdmFsdWUucmF3 VmFsdWUoKTsgfQogCiAgICAgaW5saW5lIGludCB0b0ludCgpIGNvbnN0IHsgcmV0dXJuIG1fdmFs dWUgLyBrRml4ZWRQb2ludERlbm9taW5hdG9yOyB9Ci0gICAgaW5saW5lIHVuc2lnbmVkIHRvVW5z aWduZWQoKSBjb25zdCB7IEFTU0VSVChtX3ZhbHVlID49IDApOyByZXR1cm4gdG9JbnQoKTsgfQor ICAgIGlubGluZSB1bnNpZ25lZCB0b1Vuc2lnbmVkKCkgY29uc3QgeyBSRVBPUlRfT1ZFUkZMT1co bV92YWx1ZSA+PSAwKTsgcmV0dXJuIHRvSW50KCk7IH0KICAgICBpbmxpbmUgZmxvYXQgdG9GbG9h dCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PGZsb2F0PihtX3ZhbHVlKSAvIGtGaXhlZFBv aW50RGVub21pbmF0b3I7IH0KICAgICBpbmxpbmUgZG91YmxlIHRvRG91YmxlKCkgY29uc3QgeyBy ZXR1cm4gc3RhdGljX2Nhc3Q8ZG91YmxlPihtX3ZhbHVlKSAvIGtGaXhlZFBvaW50RGVub21pbmF0 b3I7IH0KIApAQCAtODEsNyArOTUsNyBAQCBwdWJsaWM6CiAgICAgaW5saW5lIHZvaWQgc2V0UmF3 VmFsdWUoaW50IHZhbHVlKSB7IG1fdmFsdWUgPSB2YWx1ZTsgfQogICAgIGlubGluZSB2b2lkIHNl dFJhd1ZhbHVlKGxvbmcgbG9uZyB2YWx1ZSkKICAgICB7Ci0gICAgICAgIEFTU0VSVCh2YWx1ZSA+ IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6bWluKCkgJiYgdmFsdWUgPCBzdGQ6Om51bWVyaWNf bGltaXRzPGludD46Om1heCgpKTsKKyAgICAgICAgUkVQT1JUX09WRVJGTE9XKHZhbHVlID4gc3Rk OjpudW1lcmljX2xpbWl0czxpbnQ+OjptaW4oKSAmJiB2YWx1ZSA8IHN0ZDo6bnVtZXJpY19saW1p dHM8aW50Pjo6bWF4KCkpOwogICAgICAgICBtX3ZhbHVlID0gc3RhdGljX2Nhc3Q8aW50Pih2YWx1 ZSk7CiAgICAgfQogCg==