Commits

Anonymous committed 15cd6ed

fix trace escape function to handle non-nil-terminated lists

(they're valid data, and the dict module sometimes uses them)

Comments (0)

Files changed (1)

src/webmachine_resource.erl

 escape_trace_data(Pid) when is_pid(Pid) ->
     {'WMTRACE_ESCAPED_PID', pid_to_list(Pid)};
 escape_trace_data(List) when is_list(List) ->
-    [ escape_trace_data(E) || E <- List ];
+    escape_trace_list(List, []);
 escape_trace_data(Tuple) when is_tuple(Tuple) ->
     list_to_tuple(escape_trace_data(tuple_to_list(Tuple)));
 escape_trace_data(Other) ->
     Other.
 
+escape_trace_list([Head|Tail], Acc) ->
+    escape_trace_list(Tail, [escape_trace_data(Head)|Acc]);
+escape_trace_list([], Acc) ->
+    %% proper, nil-terminated list
+    lists:reverse(Acc);
+escape_trace_list(Final, Acc) ->
+    %% non-nil-terminated list, like the dict module uses
+    lists:reverse(tl(Acc))++[hd(Acc)|escape_trace_data(Final)].
+
 log_decision(File, DecisionID) ->
     io:format(File, "{decision, ~p}.~n", [DecisionID]).
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.