ofproto: Fix segfault when changing command execution settings
authorTetsuo NAKAGAWA <nakagawa@mxc.nes.nec.co.jp>
Tue, 5 Jan 2010 02:19:47 +0000 (18:19 -0800)
committerJustin Pettit <jpettit@nicira.com>
Tue, 5 Jan 2010 02:19:47 +0000 (18:19 -0800)
If the remote command execution settings are changed and a NULL argument
is given for the directory, a crash would occur.  With this change, the
default directory is used.

ofproto/executer.c

index bc42ccf8693561bec579cb7832ee591dcff587b4..b78b0df09714bcf7f8026f490887d62d13c2f3b4 100644 (file)
@@ -508,5 +508,7 @@ executer_set_acl(struct executer *e, const char *acl, const char *dir)
     free(e->command_acl);
     e->command_acl = xstrdup(acl);
     free(e->command_dir);
-    e->command_dir = xstrdup(dir);
+    e->command_dir = (dir
+                      ? xstrdup(dir)
+                      : xasprintf("%s/commands", ovs_pkgdatadir));
 }