fumiama/simple-protobuf
1
0
Fork 0
mirror of https://github.com/fumiama/simple-protobuf.git synced 2026-06-25 05:20:23 +08:00
Code Activity

优化代码结构

Browse Source
This commit is contained in:
源文雨
2022-04-04 18:05:56 +08:00
parent 9e8d9efefe
commit f94738a2f1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
protobuf.c
View File

@@ -36,7 +36,7 @@ static int write_num(FILE* fp, uint32_t n) {
SIMPLE_PB* get_pb(FILE* fp) { SIMPLE_PB* get_pb(FILE* fp) {
uint32_t init_pos = ftell(fp); uint32_t init_pos = ftell(fp);
uint32_t struct_len = read_num(fp); uint32_t struct_len = read_num(fp);
if(struct_len <= 1) return NULL; if(struct_len <= 1 || struct_len >= 1u<<20) return NULL; // 1B<struct_len<1MB
SIMPLE_PB* spb = malloc(struct_len + 2 * sizeof(uint32_t)); SIMPLE_PB* spb = malloc(struct_len + 2 * sizeof(uint32_t));
if(!spb) return NULL; if(!spb) return NULL;
spb->struct_len = struct_len; spb->struct_len = struct_len;
@@ -45,7 +45,7 @@ SIMPLE_PB* get_pb(FILE* fp) {
for(char* p = spb->target; p < spb->target+struct_len; p += offset) { for(char* p = spb->target; p < spb->target+struct_len; p += offset) {
offset = read_num(fp); offset = read_num(fp);
data_len = read_num(fp); data_len = read_num(fp);
if(data_len > 0) fread(p, data_len, 1, fp); if(data_len > 0 && data_len <= offset) fread(p, data_len, 1, fp);
} }
spb->real_len = ftell(fp) - init_pos; spb->real_len = ftell(fp) - init_pos;
return spb; return spb;