summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLloyd Hilaiel <lloyd@hilaiel.com>2009-04-01 19:55:00 +0300
committerLloyd Hilaiel <lloyd@hilaiel.com>2009-04-01 19:55:00 +0300
commit6c00f290e121fc97b49c217000456650fafda61b (patch)
tree1ac1ee0ecaa48d6d6bd1a9339b2704d5059c3ecb
parent735ac9f42168c1ec7492358a5b1debcd8cb05525 (diff)
downloadyajl-6c00f290e121fc97b49c217000456650fafda61b.tar.gz
resolve crash in json_reformatter due to incorrectly ordered parameters1.0.1
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog4
-rw-r--r--reformatter/json_reformat.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0570f3..46fed3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ PROJECT(YetAnotherJSONParser)
SET (YAJL_MAJOR 1)
SET (YAJL_MINOR 0)
-SET (YAJL_MICRO 0)
+SET (YAJL_MICRO 1)
SET (YAJL_DIST_NAME "yajl-${YAJL_MAJOR}.${YAJL_MINOR}.${YAJL_MICRO}")
diff --git a/ChangeLog b/ChangeLog
index 4b8fe9f..1c39aba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1.0.1
+ * lth resolve crash in json_reformatter due to incorrectly ordered
+ parameters.
+
1.0.0
* lth add 'make install' rules, thaks to Andrei Soroker for the
contribution.
diff --git a/reformatter/json_reformat.c b/reformatter/json_reformat.c
index d117179..a85f2ea 100644
--- a/reformatter/json_reformat.c
+++ b/reformatter/json_reformat.c
@@ -159,7 +159,7 @@ main(int argc, char ** argv)
g = yajl_gen_alloc(&conf, NULL);
/* ok. open file. let's read and parse */
- hand = yajl_alloc(&callbacks, &cfg, (void *) g, NULL);
+ hand = yajl_alloc(&callbacks, &cfg, NULL, (void *) g);
while (!done) {
rd = fread((void *) fileData, 1, sizeof(fileData) - 1, stdin);