mirror of
https://github.com/cesanta/mongoose.git
synced 2026-10-27 12:26:24 +00:00
Introduce mg_calloc
This commit is contained in:
1 parent
5f1f4a0df8
commit
074ef5197b
26 files changed
+259
-313
No files matched your search
+4
-4
@@ -320,10 +320,10 @@ char *mg_json_get_str(struct mg_str json, const char *path) {
|
||||
char *result = NULL;
|
||||
int len = 0, off = mg_json_get(json, path, &len);
|
||||
if (off >= 0 && len > 1 && json.buf[off] == '"') {
|
||||
if ((result = (char *) calloc(1, (size_t) len)) != NULL &&
|
||||
if ((result = (char *) mg_calloc(1, (size_t) len)) != NULL &&
|
||||
!mg_json_unescape(mg_str_n(json.buf + off + 1, (size_t) (len - 2)),
|
||||
result, (size_t) len)) {
|
||||
free(result);
|
||||
mg_free(result);
|
||||
result = NULL;
|
||||
}
|
||||
}
|
||||
@@ -334,7 +334,7 @@ char *mg_json_get_b64(struct mg_str json, const char *path, int *slen) {
|
||||
char *result = NULL;
|
||||
int len = 0, off = mg_json_get(json, path, &len);
|
||||
if (off >= 0 && json.buf[off] == '"' && len > 1 &&
|
||||
(result = (char *) calloc(1, (size_t) len)) != NULL) {
|
||||
(result = (char *) mg_calloc(1, (size_t) len)) != NULL) {
|
||||
size_t k = mg_base64_decode(json.buf + off + 1, (size_t) (len - 2), result,
|
||||
(size_t) len);
|
||||
if (slen != NULL) *slen = (int) k;
|
||||
@@ -346,7 +346,7 @@ char *mg_json_get_hex(struct mg_str json, const char *path, int *slen) {
|
||||
char *result = NULL;
|
||||
int len = 0, off = mg_json_get(json, path, &len);
|
||||
if (off >= 0 && json.buf[off] == '"' && len > 1 &&
|
||||
(result = (char *) calloc(1, (size_t) len / 2)) != NULL) {
|
||||
(result = (char *) mg_calloc(1, (size_t) len / 2)) != NULL) {
|
||||
int i;
|
||||
for (i = 0; i < len - 2; i += 2) {
|
||||
mg_str_to_num(mg_str_n(json.buf + off + 1 + i, 2), 16, &result[i >> 1],
|
||||
|
||||
Reference in new issue
Block a user