summaryrefslogtreecommitdiff
path: root/apps/plugins/puzzles/src/filling.c
diff options
context:
space:
mode:
authorFranklin Wei <git@fwei.tk>2018-06-20 19:13:03 -0400
committerFranklin Wei <git@fwei.tk>2018-06-20 19:13:03 -0400
commitd64ff86fb6be22875cfae054f8a878dbd8b1472b (patch)
tree64f09b043bd7f1b2a327c2bf5f1517353b8884f9 /apps/plugins/puzzles/src/filling.c
parent708a54d3de31ef76f524baeb0f5c2697589e93d7 (diff)
downloadrockbox-d64ff86fb6be22875cfae054f8a878dbd8b1472b.zip
rockbox-d64ff86fb6be22875cfae054f8a878dbd8b1472b.tar.gz
rockbox-d64ff86fb6be22875cfae054f8a878dbd8b1472b.tar.bz2
rockbox-d64ff86fb6be22875cfae054f8a878dbd8b1472b.tar.xz
puzzles: resync with upstream
This brings the source to upstream commit 506b073 (though I have made some extra commits on top of that). Notably this includes a fix for a double-free bug that I myself introduced upstream. Change-Id: I02671586bbc34d63e05398ee971271fed42538cf
Diffstat (limited to 'apps/plugins/puzzles/src/filling.c')
-rw-r--r--apps/plugins/puzzles/src/filling.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/puzzles/src/filling.c b/apps/plugins/puzzles/src/filling.c
index 0e89728..e866a25 100644
--- a/apps/plugins/puzzles/src/filling.c
+++ b/apps/plugins/puzzles/src/filling.c
@@ -1289,10 +1289,10 @@ static const char *validate_desc(const game_params *params, const char *desc)
static key_label *game_request_keys(const game_params *params, int *nkeys)
{
+ int i;
key_label *keys = snewn(11, key_label);
- *nkeys = 11;
- int i;
+ *nkeys = 11;
for(i = 0; i < 10; ++i)
{