aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-10-29 11:59:30 +0200
committerBjörn Gustavsson <[email protected]>2010-10-29 11:59:36 +0200
commitc14970e178a7cef8dcb214653f9fc9b6c741ce10 (patch)
treec261be3cbc27a20f8e340330298fd4041a1fe165 /lib/stdlib
parente3ef31fe6b728ccc2149cac7e1b3e10d0a65ec6f (diff)
parentb9fc6c54079d4932fb156b9dad1f5c3ec946f952 (diff)
downloadotp-c14970e178a7cef8dcb214653f9fc9b6c741ce10.tar.gz
otp-c14970e178a7cef8dcb214653f9fc9b6c741ce10.tar.bz2
otp-c14970e178a7cef8dcb214653f9fc9b6c741ce10.zip
Merge branch 'ms/fix-string-copies' into dev
* ms/fix-string-copies: string_SUITE: Add test for string:copies(Str, Float) string_SUITE: Fix copy and paste error in test of string:copies/2 Fix crash in string:copies/2 OTP-8915
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/string.erl2
-rw-r--r--lib/stdlib/test/string_SUITE.erl5
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index 6636a03f06..c987c224db 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -201,7 +201,7 @@ chars(C, 0, Tail) when is_integer(C) ->
-spec copies(string(), non_neg_integer()) -> string().
-copies(CharList, Num) when is_list(CharList), Num >= 0 ->
+copies(CharList, Num) when is_list(CharList), is_integer(Num), Num >= 0 ->
copies(CharList, Num, []).
copies(_CharList, 0, R) ->
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index 3171b87c44..452e048dd7 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -240,7 +240,8 @@ copies(Config) when is_list(Config) ->
?line "." = string:copies(".", 1),
?line 30 = length(string:copies("123", 10)),
%% invalid arg type
- ?line {'EXIT',_} = (catch string:chars("hej", -1)),
+ ?line {'EXIT',_} = (catch string:copies("hej", -1)),
+ ?line {'EXIT',_} = (catch string:copies("hej", 2.0)),
ok.
words(suite) ->