Merge branch 'bugfix-748599' of /home/kostja/work/dam into master-stable

core/tarantool.c

@@ -448,7 +448,7 @@ main(int argc, char **argv)
 
 		i = tarantool_cfg_iterator_init();
 		while ((key = tarantool_cfg_iterator_next(i, &cfg, &value)) != NULL) {
-			if (strcmp(key, cfg_paramname) == 0) {
+			if (strcmp(key, cfg_paramname) == 0 && value != NULL) {
 				printf("%s\n", value);
 				free(value);
 

test/box/args.result

@@ -38,6 +38,8 @@ Usage: tarantool_silverbox [OPTIONS]
 Please visit project home page at http://launchpad.net/tarantool
 to see online documentation, submit bugs or contribute a patch.
 
+tarantool_silverbox --cfg-get=custom_proc_title
+
 tarantool_silverbox -Z
 tarantool_silverbox: -Z: unknown option
 

test/box/args.test

@@ -4,6 +4,7 @@ import os
 server.test_option("--help")
 server.test_option("-h")
 sys.stdout.push_filter("(/\S+)+/tarantool", "tarantool")
+server.test_option("--cfg-get=custom_proc_title")
 server.test_option("-Z")
 server.test_option("--no-such-option")
 server.test_option("--version --no-such-option")