X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=gtk-gui.c;h=04b7af113fac2edb5ccfa0372fb898f286cc8083;hp=a536c15e688101efaf616e2c1adf818125876342;hb=9d1057469485739c9a2563cf7c88fd2debc1e730;hpb=642c83f5327317780a0f10b3ab46f6c1bd8bb202

diff --git a/gtk-gui.c b/gtk-gui.c
index a536c15..04b7af1 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -175,6 +175,8 @@ static void file_open(GtkWidget *w, gpointer data)
 /* return the path and the file component contained in the full path */
 static char *path_and_file(char *pathin, char **fileout) {
 	char *slash = pathin, *next;
+	char *result;
+	size_t len, n;
 
 	if (! pathin) {
 		*fileout = strdup("");
@@ -185,7 +187,19 @@ static char *path_and_file(char *pathin, char **fileout) {
 	if (pathin != slash)
 		slash++;
 	*fileout = strdup(slash);
-        return strndup(pathin, slash - pathin);
+
+	/* strndup(pathin, slash - pathin) */
+	n = slash - pathin;
+	len = strlen(pathin);
+	if (n < len)
+		len = n;
+
+	result = (char *)malloc(len + 1);
+	if (!result)
+		return 0;
+
+	result[len] = '\0';
+	return (char *)memcpy(result, pathin, len);
 }
 
 static void file_save_as(GtkWidget *w, gpointer data)
@@ -206,6 +220,9 @@ static void file_save_as(GtkWidget *w, gpointer data)
 	current_dir = path_and_file(existing_filename, &current_file);
 	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), current_dir);
 	gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), current_file);
+
+	free(current_dir);
+
 	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
 		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 	}