Merge pull request #6 from greg42/trunk

Fix a segfault when sample_dir cannot be opened
navit-gps · Aug 8, 2015 · dadf3d2 · dadf3d2
2 parents 4be9aaf + 989fa42
commit dadf3d2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/navit/speech/cmdline/speech_cmdline.c b/navit/speech/cmdline/speech_cmdline.c
@@ -236,6 +236,10 @@ speechd_new(struct speech_methods *meth, struct attr **attrs, struct attr *paren
 		this->flags=attr->u.num;
 	if (this->sample_dir && this->sample_suffix) {
 		void *handle=file_opendir(this->sample_dir);
+		if (!handle) {
+			dbg(lvl_error,"Cannot read sample directory contents: %s", this->sample_dir);
+			return NULL;
+		}
 		char *name;
 		int suffix_len=strlen(this->sample_suffix);
 		while((name=file_readdir(handle))) {