X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=b358c96cd9afd23bfa7f043c8add8bbf8b4bfade;hp=c04d4f9c99e89afb451afe94be7fcc64461b15e1;hb=c0e4799bafc72ffdb7e8912317b8f74acbbc2736;hpb=0c7c4d80673854527ce3c3786dd581169565b5e6

diff --git a/aft.c b/aft.c
index c04d4f9c..b358c96c 100644
--- a/aft.c
+++ b/aft.c
@@ -407,7 +407,7 @@ static void load_chunk_table(struct afh_info *afhi, const struct osl_object *ct)
 	int i;
 	size_t sz;
 
-	if (!ct->data || ct->size < 4) {
+	if (!ct->data || ct->size < 4 * (afhi->chunks_total + 1)) {
 		afhi->chunk_table = NULL;
 		return;
 	}
@@ -589,8 +589,10 @@ static int get_hash_of_row(const struct osl_row *row, unsigned char **hash)
 int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi)
 {
 	struct osl_object obj;
-	int ret = osl(osl_get_object(audio_file_table, row, AFTCOL_AFHI,
-		&obj));
+	int ret;
+
+	assert(row);
+	ret = osl(osl_get_object(audio_file_table, row, AFTCOL_AFHI, &obj));
 	if (ret < 0)
 		return ret;
 	load_afhi(obj.data, afhi);
@@ -719,7 +721,8 @@ __a_const static short unsigned get_duration_width(int seconds)
 	return width + 6;
 }
 
-static void get_duration_buf(int seconds, char *buf, struct ls_options *opts)
+static void get_duration_buf(int seconds, char *buf, size_t bufsize,
+		struct ls_options *opts)
 {
 	unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60;
 	short unsigned max_width;
@@ -727,10 +730,12 @@ static void get_duration_buf(int seconds, char *buf, struct ls_options *opts)
 	if (!hours) { /* m:ss or mm:ss */
 		max_width = opts->mode == LS_MODE_LONG?
 			opts->widths.duration_width : 4;
+		assert(max_width < bufsize - 1);
 		sprintf(buf, "%*u:%02d", max_width - 3, mins, seconds % 60);
 	} else { /* more than one hour => h:mm:ss, hh:mm:ss, hhh:mm:ss, ... */
 		max_width = opts->mode == LS_MODE_LONG?
 			opts->widths.duration_width : 7;
+		assert(max_width < bufsize - 1);
 		sprintf(buf, "%*u:%02u:%02d", max_width - 6, hours, mins,
 			seconds % 60);
 	}
@@ -854,7 +859,8 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		if (ret < 0)
 			goto out;
 	}
-	get_duration_buf(afhi->seconds_total, duration_buf, opts);
+	get_duration_buf(afhi->seconds_total, duration_buf,
+		sizeof(duration_buf), opts);
 	if (opts->mode == LS_MODE_LONG) {
 		struct ls_widths *w = &opts->widths;
 		if (lls_opt_given(r_a))
@@ -1035,17 +1041,33 @@ int open_and_update_audio_file(struct audio_file_data *afd)
 	struct afsi_change_event_data aced;
 	struct osl_object map, chunk_table_obj;
 	struct ls_data *d = &status_item_ls_data;
+	unsigned char *tmp_hash;
 again:
 	ret = score_get_best(&current_aft_row, &d->score);
 	if (ret < 0)
 		return ret;
-	ret = get_hash_of_row(current_aft_row, &d->hash);
+	/*
+	 * get_hash_of_row() and get_audio_file_path_of_row() initialize
+	 * their pointer argument to point to memory-mapped files. These pointers
+	 * become stale after a new audio file has been added or after the
+	 * server process received SIGHUP. For in both cases libosl unmaps and
+	 * remaps the underlying database files, and this remapping may well
+	 * change the starting address of the mapping. To avoid stale pointer
+	 * references we create copies on the heap.
+	 */
+	ret = get_hash_of_row(current_aft_row, &tmp_hash);
 	if (ret < 0)
 		return ret;
+	if (!d->hash)
+		d->hash = para_malloc(HASH_SIZE);
+	memcpy(d->hash, tmp_hash, HASH_SIZE);
+	free(d->path);
 	ret = get_audio_file_path_of_row(current_aft_row, &d->path);
 	if (ret < 0)
 		return ret;
 	PARA_NOTICE_LOG("%s\n", d->path);
+	d->path = para_strdup(d->path);
+
 	ret = get_afsi_object_of_row(current_aft_row, &afsi_obj);
 	if (ret < 0)
 		return ret;
@@ -2518,10 +2540,12 @@ static int aft_open(const char *dir)
 		PARA_NOTICE_LOG("current audio file hash lookup: success\n");
 		return 1;
 	}
-	PARA_NOTICE_LOG("failed to open audio file table\n");
 	audio_file_table = NULL;
-	if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT))
+	if (ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT)) {
+		PARA_WARNING_LOG("no audio file table\n");
 		return 1;
+	}
+	PARA_NOTICE_LOG("failed to open audio file table\n");
 	return ret;
 }
 
@@ -2579,7 +2603,8 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 		ret = get_audio_file_path_of_row(current_aft_row, &path);
 		if (ret < 0)
 			return ret;
-		status_item_ls_data.path = path;
+		free(status_item_ls_data.path);
+		status_item_ls_data.path = para_strdup(path);
 		make_status_items();
 		return 1;
 	} case AFHI_CHANGE: {
@@ -2601,8 +2626,14 @@ static int aft_event_handler(enum afs_events event, struct para_buffer *pb,
 		/*
 		 * These events are rare. We don't bother to check whether the
 		 * current status items are affected and simply recreate them
-		 * every time.
+		 * whenever an audio file is open.
 		 */
+		if (!current_aft_row)
+			return 0;
+		ret = get_afhi_of_row(current_aft_row,
+			&status_item_ls_data.afhi);
+		if (ret < 0)
+			return ret;
 		make_status_items();
 		return 0;
 	} default: