mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

c: Allow NULL optargs to be passed to _argv calls

Browse Source 
Previously, passing NULL optargs to an _argv call resulted in a segfault. This
change causes NULL optargs to be interpreted as no optargs, and to be correctly
handled accordingly.
This commit is contained in:
Matthew Booth
2012-01-17 13:44:29 +00:00
parent c7119da130
commit fd1a6d8003
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
generator/generator_c.ml
View File

@@ -994,6 +994,16 @@ trace_send_line (guestfs_h *g)
indent shortname (string_of_errcode errcode)
in
let handle_null_optargs optargs shortname =
if optargs <> [] then (
pr " struct guestfs_%s_argv optargs_null;\n" shortname;
pr " if (!optargs) {\n";
pr " optargs_null.bitmask = 0;\n";
pr " optargs = &optargs_null;\n";
pr " }\n\n";
)
in
(* For non-daemon functions, generate a wrapper around each function. *)
List.iter (
fun (shortname, (ret, _, optargs as style), _, _, _, _, _) ->
@@ -1006,6 +1016,9 @@ trace_send_line (guestfs_h *g)
~handle:"g" ~prefix:"guestfs_" ~suffix:"_argv" ~optarg_proto:Argv
shortname style;
pr "{\n";
handle_null_optargs optargs shortname;
pr " int trace_flag = g->trace;\n";
pr " FILE *trace_fp;\n";
(match ret with
@@ -1071,6 +1084,8 @@ trace_send_line (guestfs_h *g)
pr "{\n";
handle_null_optargs optargs shortname;
(match args with
| [] -> ()
| _ -> pr " struct %s_args args;\n" name