X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=5595071f2ade631b25db6872b13dcec978ba9141;hp=0db2c5803dfa4c100b092f9c022759f1b85e043b;hb=92c6b27d3a3fb01cf516be2fa8885d07ca92c9c7;hpb=6bded356ec89b1344049ff702e6c6babaeccd439

diff --git a/aft.c b/aft.c
index 0db2c580..5595071f 100644
--- a/aft.c
+++ b/aft.c
@@ -396,7 +396,7 @@ static void save_chunk_table(struct afh_info *afhi, char *buf)
 {
 	uint32_t n;
 
-	if (!afhi->chunk_table)
+	if (!afhi->chunk_table || afhi->chunks_total == 0)
 		return;
 	for (n = 0; n <= afhi->chunks_total; n++)
 		write_u32(buf + 4 * n, afhi->chunk_table[n]);
@@ -1035,17 +1035,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;
@@ -2579,7 +2595,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: {