aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2013-04-13 10:37:27 +0000
committerSimon Tatham <anakin@pobox.com>2013-04-13 10:37:27 +0000
commit339329449f4db72e4754f21c14295303ffe0ea5d (patch)
treedf4cb872091b730d8af32f9f0b8a258e7442b0cd
parent0b93de904a98f119b1a95d3a53029f1ed4bfb9b3 (diff)
downloadpuzzles-339329449f4db72e4754f21c14295303ffe0ea5d.zip
puzzles-339329449f4db72e4754f21c14295303ffe0ea5d.tar.gz
puzzles-339329449f4db72e4754f21c14295303ffe0ea5d.tar.bz2
puzzles-339329449f4db72e4754f21c14295303ffe0ea5d.tar.xz
Fix a memory management bug in Filling: in some situations its
solve_game() was returning its aux parameter un-dupstr()ed, which is wrong. Also clarified the developer docs on that function to make it clearer that the returned string should be dynamic. [originally from svn r9831]
-rw-r--r--devel.but8
-rw-r--r--filling.c2
2 files changed, 6 insertions, 4 deletions
diff --git a/devel.but b/devel.but
index e95e1d2..75ddeb7 100644
--- a/devel.but
+++ b/devel.but
@@ -1020,9 +1020,11 @@ it may return \cw{NULL}. If it does this, it must also set
\q{Solution not known for this puzzle}); that error message is not
expected to be dynamically allocated.
-If this function \e{does} produce a solution, it returns a move
-string suitable for feeding to \cw{execute_move()}
-(\k{backend-execute-move}).
+If this function \e{does} produce a solution, it returns a move string
+suitable for feeding to \cw{execute_move()}
+(\k{backend-execute-move}). Like a (non-empty) string returned from
+\cw{interpret_move()}, the returned string should be dynamically
+allocated.
\H{backend-drawing} Drawing the game graphics
diff --git a/filling.c b/filling.c
index 4cd4318..cad0733 100644
--- a/filling.c
+++ b/filling.c
@@ -975,7 +975,7 @@ static char *solve_game(game_state *state, game_state *currstate,
if (!solver(state->board, w, h, &aux))
*error = "Sorry, I couldn't find a solution";
}
- return aux;
+ return dupstr(aux);
}
/*****************************************************************************