From a0c65862e8beaca2d2c0b9d6d13eca862641994c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 19 Sep 2012 15:55:53 +0200
Subject: common_test: Don't use undocumented features of io:format()

The Format string argument for io:format() is not documented
to accept an iolist, so we should not depend on it.

Also, it is bad practice to use an arbitrary string as a format
string for io:format(), since it could contain a '~' character
which could trigger a badarg exception.

Fix both problems at the same time by using io:put_chars() to
display the iolist.
---
 lib/common_test/src/ct_master.erl      |  5 +++--
 lib/common_test/src/ct_master_logs.erl | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'lib/common_test/src')

diff --git a/lib/common_test/src/ct_master.erl b/lib/common_test/src/ct_master.erl
index 042c5ba267..99bec3ea09 100644
--- a/lib/common_test/src/ct_master.erl
+++ b/lib/common_test/src/ct_master.erl
@@ -696,8 +696,9 @@ status(MasterPid,Event) ->
 
 log(To,Heading,Str,Args) ->
     if To == all ; To == tty ->
-	    Str1 = ["=== ",Heading," ===\n",io_lib:format(Str,Args),"\n"],
-	    io:format(Str1,[]);
+	    Chars = ["=== ",Heading," ===\n",
+		     io_lib:format(Str,Args),"\n"],
+	    io:put_chars(Chars);
        true ->
 	    ok
     end,
diff --git a/lib/common_test/src/ct_master_logs.erl b/lib/common_test/src/ct_master_logs.erl
index 9e61d5b16f..1e65337241 100644
--- a/lib/common_test/src/ct_master_logs.erl
+++ b/lib/common_test/src/ct_master_logs.erl
@@ -204,7 +204,7 @@ open_ct_master_log(Dir) ->
     {ok,Fd} = file:open(FullName,[write]),
     io:format(Fd,header("Common Test Master Log", {[],[1,2],[]}),[]),
     %% maybe add config info here later
-    io:format(Fd, config_table([]), []),
+    io:put_chars(config_table([])),
     io:format(Fd,
 	      "<style>\n"
 	      "div.ct_internal { background:lightgrey; color:black }\n"
@@ -253,11 +253,11 @@ open_nodedir_index(Dir,StartTime) ->
 
 print_nodedir(Node,RunDir,Fd) ->
     Index = filename:join(RunDir,"index.html"),
-    io:format(Fd,
-	      ["<tr>\n"
-	       "<td align=center>",atom_to_list(Node),"</td>\n",
-	       "<td align=left><a href=\"",Index,"\">",Index,"</a></td>\n",
-	       "</tr>\n"],[]),
+    io:put_chars(Fd,
+		 ["<tr>\n"
+		  "<td align=center>",atom_to_list(Node),"</td>\n",
+		  "<td align=left><a href=\"",Index,"\">",Index,"</a></td>\n",
+		  "</tr>\n"]),
     ok.
 
 close_nodedir_index(Fd) ->
-- 
cgit v1.2.3


From 8029ee113841f08454d5e826a9af23a18c0f0186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 19 Sep 2012 15:55:53 +0200
Subject: ct_master_logs: Don't use io:format/3 with an empty variable list

It is bad practice to use an arbitrary string as a format
string for io:format(), since it could contain a '~' character
which could trigger a badarg exception. Therefore, replace all
io:format/3 calls that looks like:

  io:format(Fd, String, [])

with:

  io:put_chars(Fd, String)
---
 lib/common_test/src/ct_master_logs.erl | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'lib/common_test/src')

diff --git a/lib/common_test/src/ct_master_logs.erl b/lib/common_test/src/ct_master_logs.erl
index 1e65337241..d76288feef 100644
--- a/lib/common_test/src/ct_master_logs.erl
+++ b/lib/common_test/src/ct_master_logs.erl
@@ -134,7 +134,7 @@ init(Parent,LogDir,Nodes) ->
 
     io:format(CtLogFd,int_header(),[log_timestamp(now()),"Test Nodes\n"]),
     io:format(CtLogFd,"~s\n",[NodeStr]),
-    io:format(CtLogFd,int_footer()++"\n",[]),
+    io:put_chars(CtLogFd,[int_footer(),"\n"]),
 
     NodeDirIxFd = open_nodedir_index(RunDirAbs,Time),
     Parent ! {started,self(),{Time,RunDirAbs}},
@@ -202,24 +202,21 @@ loop(State) ->
 open_ct_master_log(Dir) ->
     FullName = filename:join(Dir,?ct_master_log_name),
     {ok,Fd} = file:open(FullName,[write]),
-    io:format(Fd,header("Common Test Master Log", {[],[1,2],[]}),[]),
+    io:put_chars(Fd,header("Common Test Master Log", {[],[1,2],[]})),
     %% maybe add config info here later
     io:put_chars(config_table([])),
-    io:format(Fd,
-	      "<style>\n"
-	      "div.ct_internal { background:lightgrey; color:black }\n"
-	      "div.default     { background:lightgreen; color:black }\n"
-	      "</style>\n",
-	      []),
-    io:format(Fd, 
-	      xhtml("<br><h2>Progress Log</h2>\n<pre>\n",
-		    "<br /><h2>Progress Log</h2>\n<pre>\n"),
-	      []),
+    io:put_chars(Fd,
+		 "<style>\n"
+		 "div.ct_internal { background:lightgrey; color:black }\n"
+		 "div.default     { background:lightgreen; color:black }\n"
+		 "</style>\n"),
+    io:put_chars(Fd, 
+		 xhtml("<br><h2>Progress Log</h2>\n<pre>\n",
+		       "<br /><h2>Progress Log</h2>\n<pre>\n")),
     Fd.
 
 close_ct_master_log(Fd) ->
-    io:format(Fd,"</pre>",[]),
-    io:format(Fd,footer(),[]),
+    io:put_chars(Fd,["</pre>",footer()]),
     file:close(Fd).
 
 config_table(Vars) ->
@@ -248,7 +245,7 @@ int_footer() ->
 open_nodedir_index(Dir,StartTime) ->
     FullName = filename:join(Dir,?nodedir_index_name),
     {ok,Fd} = file:open(FullName,[write]),
-    io:format(Fd,nodedir_index_header(StartTime),[]),
+    io:put_chars(Fd,nodedir_index_header(StartTime)),
     Fd.
 
 print_nodedir(Node,RunDir,Fd) ->
@@ -261,7 +258,7 @@ print_nodedir(Node,RunDir,Fd) ->
     ok.
 
 close_nodedir_index(Fd) ->
-    io:format(Fd,index_footer(),[]),
+    io:put_chars(Fd,index_footer()),
     file:close(Fd).
 
 nodedir_index_header(StartTime) ->
-- 
cgit v1.2.3