Skip to content

Commit 8aea39f

Browse files
committed
fix cppcheck warning
1 parent 358b9f1 commit 8aea39f

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@
1010
*.dSYM
1111
*.out
1212
test*.lua
13+
lua*/
14+
test*
15+
*.natvis
16+
out*

pb.h

+5-6
Original file line numberDiff line numberDiff line change
@@ -676,11 +676,10 @@ PB_API size_t pb_resizebuffer(pb_Buffer *b, size_t len) {
676676
while (newsize < PB_MAX_SIZET/2 && newsize < len)
677677
newsize += newsize >> 1;
678678
if (newsize > b->size) {
679-
char *newbuff = b->buff == b->init_buff ? NULL : b->buff;
680-
if ((newbuff = (char*)realloc(newbuff, newsize)) == NULL)
681-
return 0;
682-
if (b->buff == b->init_buff)
683-
memcpy(newbuff, b->buff, b->size);
679+
char *buff = b->buff == b->init_buff ? NULL : b->buff;
680+
char *newbuff = (char*)realloc(buff, newsize);
681+
if (newbuff == NULL) return 0;
682+
if (b->buff == b->init_buff) memcpy(newbuff, b->buff, b->size);
684683
b->buff = newbuff;
685684
b->capacity = newsize;
686685
}
@@ -1204,7 +1203,7 @@ PB_API pb_Field *pb_newfield(pb_State *S, pb_Type *t, pb_Name *fname, int32_t nu
12041203
f->default_value = NULL;
12051204
return f;
12061205
}
1207-
if (!(f = (pb_Field*)pb_poolalloc(&S->typepool))) return NULL;
1206+
if (!(f = (pb_Field*)pb_poolalloc(&S->fieldpool))) return NULL;
12081207
memset(f, 0, sizeof(pb_Field));
12091208
f->name = fname;
12101209
f->type = t;

0 commit comments

Comments
 (0)