Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix is_null_terminated reading arbitrary memory (issue #1425) #1429

Merged
merged 8 commits into from
Nov 23, 2016
Merged

Fix is_null_terminated reading arbitrary memory (issue #1425) #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb0dbbe
Fix is_null_terminated reading arbitrary memory
Perelandric Nov 19, 2016
6c797c3
Add tests for is_null_terminated from iso array
Perelandric Nov 21, 2016
c8524b1
Add power-of-two size array to is_null_terminated
Perelandric Nov 21, 2016
6e27505
Update is_null_terminated tests
Perelandric Nov 21, 2016
cacd346
Reverse boolean test of 3 member string
Perelandric Nov 21, 2016
98ae973
Comment out odd behaving test
Perelandric Nov 22, 2016
0ddaea2
Merge branch 'master' into fix_is_null_term
Perelandric Nov 22, 2016
d85c896
Re-enable is_null_terminated test
Perelandric Nov 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/builtin/string.pony
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ actor Main
which may be present earlier in the content of the string.
If you need a null-terminated copy of this string, use the clone method.
"""
(_alloc > 0) and (_ptr._apply(_size) == 0)
(_alloc > 0) and (_alloc != _size) and (_ptr._apply(_size) == 0)

fun utf32(offset: ISize): (U32, U8) ? =>
"""
Expand Down
7 changes: 7 additions & 0 deletions packages/builtin_test/_test.pony
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,13 @@ class iso _TestStringIsNullTerminated is UnitTest
h.assert_true("0123456".trim(2, 4).clone().is_null_terminated())
h.assert_false("0123456".trim(2, 4).is_null_terminated())

h.assert_true(String.from_iso_array(recover
['a', 'b', 'c']
end).is_null_terminated())
h.assert_false(String.from_iso_array(recover
['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'] // power of two sized array
end).is_null_terminated())


class iso _TestSpecialValuesF32 is UnitTest
"""
Expand Down