Merge pull request json-parser#33 from holyhead/patch-1

James McLaughlin · James McLaughlin · commit 63c9a78b4086 · 2014-01-25T06:04:13.000-08:00
Fix order of calloc call
diff --git a/json.c b/json.c
@@ -78,7 +78,7 @@ typedef struct
 
 static void * default_alloc (size_t size, int zero, void * user_data)
 {
-   return zero ? calloc (size, 1) : malloc (size);
+   return zero ? calloc (1, size) : malloc (size);
 }
 
 static void default_free (void * ptr, void * user_data)

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ typedef struct`
`78`	`78`
`79`	`79`	`static void * default_alloc (size_t size, int zero, void * user_data)`
`80`	`80`	`{`
`81`		`- return zero ? calloc (size, 1) : malloc (size);`
	`81`	`+ return zero ? calloc (1, size) : malloc (size);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`static void default_free (void * ptr, void * user_data)`