summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2011-01-31 07:15:11 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-01-31 07:15:11 +0000
commitc311b215b6507a06ba4156a71196d99f829d221c (patch)
tree218e3d56db6589e23f030507f807d5fd8c7dbdc7
parent3bd50c372b0521de18089321a3b9940f75956aa2 (diff)
downloadeet-c311b215b6507a06ba4156a71196d99f829d221c.tar.gz
port fix from trunk.
SVN revision: 56567
-rw-r--r--ChangeLog6
-rw-r--r--src/lib/eet_dictionary.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dbe3f04..6594360 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -480,5 +480,9 @@
2011-01-29 Carsten Haitzler (The Rasterman)
- 1.4.0 release
+ * 1.4.0 release
+2011-01-29 Vincent Torri
+
+ * Use eina_stringshare_add() instead of strdup() on mmaped file names
+ on Windows. This fix eet shut down on Windows.
diff --git a/src/lib/eet_dictionary.c b/src/lib/eet_dictionary.c
index 566f148..0e167ae 100644
--- a/src/lib/eet_dictionary.c
+++ b/src/lib/eet_dictionary.c
@@ -202,7 +202,7 @@ eet_dictionary_string_get_char(const Eet_Dictionary *ed,
/* Windows file system could change the mmaped file when replacing a file. So we need to copy all string in memory to avoid bugs. */
if (!ed->all[idx].allocated)
{
- ed->all[idx].str = strdup(ed->all[idx].str);
+ ed->all[idx].str = eina_stringshare_add(ed->all[idx].str);
ed->all[idx].allocated = EINA_TRUE;
}
#endif /* ifdef _WIN32 */