[PATCH] Fix Liquivision import crash

Miika Turkia miika.turkia at gmail.com
Tue Feb 2 21:21:13 PST 2016


When we detect a redundant DC we free the memory reserved for the model.
Thus we need to malloc that memory here.

Fixes #1002

Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 subsurface-core/liquivision.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/subsurface-core/liquivision.c b/subsurface-core/liquivision.c
index 295287c..b9db4a8 100644
--- a/subsurface-core/liquivision.c
+++ b/subsurface-core/liquivision.c
@@ -114,17 +114,17 @@ static void parse_dives (int log_version, const unsigned char *buf, unsigned int
 		model = *(buf + ptr);
 		switch (model) {
 		case 0:
-			dc->model = "Xen";
+			dc->model = strdup("Xen");
 			break;
 		case 1:
 		case 2:
-			dc->model = "Xeo";
+			dc->model = strdup("Xeo");
 			break;
 		case 4:
-			dc->model = "Lynx";
+			dc->model = strdup("Lynx");
 			break;
 		default:
-			dc->model = "Liquivision";
+			dc->model = strdup("Liquivision");
 			break;
 		}
 		ptr++;
-- 
2.5.0



More information about the subsurface mailing list