From 3379064a381dbeb78955f0f8e701a57eeffe5bb4 Mon Sep 17 00:00:00 2001 From: Krzysztof Rudnicki Date: Mon, 8 Sep 2025 13:19:18 +0200 Subject: [PATCH] fix: cpplint and clang tidy fixes --- articles/Makefile | 6 + articles/cppcheck.txt | 479 ++++++++++++++++++++++++++++++++++++++++++ articles/server_c.c | 277 +++++++++++++++++------- 3 files changed, 687 insertions(+), 75 deletions(-) create mode 100644 articles/cppcheck.txt diff --git a/articles/Makefile b/articles/Makefile index 3115110..cf61d8f 100644 --- a/articles/Makefile +++ b/articles/Makefile @@ -7,6 +7,12 @@ all: server_c server_c: server_c.c $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) +lint: + @echo "Running clang-tidy..." + @clang-tidy -checks=-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling server_c.c -- -std=gnu11 $(CFLAGS) $(LDFLAGS) || true + @echo "Running cppcheck..." + @cppcheck --enable=all --inconclusive --std=c11 --language=c --quiet --inline-suppr --check-level=exhaustive --suppress=missingIncludeSystem server_c.c || true + build: minify minify: diff --git a/articles/cppcheck.txt b/articles/cppcheck.txt new file mode 100644 index 0000000..2b07c1d --- /dev/null +++ b/articles/cppcheck.txt @@ -0,0 +1,479 @@ +server_c.c:2:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:3:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:4:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:5:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:6:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:7:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:8:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:9:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:10:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:11:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:12:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:13:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:14:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:15:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:16:0: information: Include file: not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem] +#include +^ +server_c.c:0:0: information: Limiting analysis of branches. Use --check-level=exhaustive to analyze all branches. [normalCheckLevelMaxBranches] + +^ +server_c.c:411:77: warning: Either the condition 'elen<8' is redundant or the array 'ext[4]' is accessed at index 7, which is out of bounds. [arrayIndexOutOfBoundsCond] + size_t elen=0; while(ext[elen] && elen<8 && isalnum((unsigned char)ext[elen])) elen++; char* ext_safe=strndup_local(ext,elen?elen:3); if(!ext_safe){ send_response(c,500,"Internal Server Error","application/json","",0,true); return; } + ^ +server_c.c:411:45: note: Assuming that condition 'elen<8' is not redundant + size_t elen=0; while(ext[elen] && elen<8 && isalnum((unsigned char)ext[elen])) elen++; char* ext_safe=strndup_local(ext,elen?elen:3); if(!ext_safe){ send_response(c,500,"Internal Server Error","application/json","",0,true); return; } + ^ +server_c.c:411:77: note: Array index out of bounds + size_t elen=0; while(ext[elen] && elen<8 && isalnum((unsigned char)ext[elen])) elen++; char* ext_safe=strndup_local(ext,elen?elen:3); if(!ext_safe){ send_response(c,500,"Internal Server Error","application/json","",0,true); return; } + ^ +server_c.c:411:31: style: Array index 'elen' is used before limits check. [arrayIndexThenCheck] + size_t elen=0; while(ext[elen] && elen<8 && isalnum((unsigned char)ext[elen])) elen++; char* ext_safe=strndup_local(ext,elen?elen:3); if(!ext_safe){ send_response(c,500,"Internal Server Error","application/json","",0,true); return; } + ^ +server_c.c:314:129: style: Condition 'tcontent[0]=='['' is always true [knownConditionTrueFalse] + char* tcontent=ltrim_dup(content); if(tcontent && tcontent[0]=='['){ size_t clen=strlen(tcontent); if(clen>=2 && tcontent[0]=='[' && tcontent[clen-1]==']'){ + ^ +server_c.c:314:66: note: Assuming that condition 'tcontent[0]=='['' is not redundant + char* tcontent=ltrim_dup(content); if(tcontent && tcontent[0]=='['){ size_t clen=strlen(tcontent); if(clen>=2 && tcontent[0]=='[' && tcontent[clen-1]==']'){ + ^ +server_c.c:314:129: note: Condition 'tcontent[0]=='['' is always true + char* tcontent=ltrim_dup(content); if(tcontent && tcontent[0]=='['){ size_t clen=strlen(tcontent); if(clen>=2 && tcontent[0]=='[' && tcontent[clen-1]==']'){ + ^ +server_c.c:463:6: warning: inconclusive: Width 1023 given in format string (no. 2) is smaller than destination buffer 'path[4096]'. [invalidScanfFormatWidth_smaller] + if(sscanf(buf, "%15s %1023s", method, path) < 2){ close(c); return; } + ^ +server_c.c:289:37: error: Common realloc mistake: 'objs' nulled but not freed upon failure [memleakOnRealloc] + if(count==cap){ cap*=2; objs=realloc(objs, cap*sizeof(char*)); } + ^ +server_c.c:369:39: error: Common realloc mistake: 'objs' nulled but not freed upon failure [memleakOnRealloc] + if(count==cap){ cap*=2; objs=realloc(objs, cap*sizeof(char*)); } + ^ +server_c.c:42:136: warning: If memory allocation fails, then there is a possible null pointer dereference: data [nullPointerOutOfMemory] +static int write_file_all(const char* path, const char* data, size_t len){ FILE* f=fopen(path,"wb"); if(!f) return -1; size_t n=fwrite(data,1,len,f); fclose(f); return n==len?0:-1; } + ^ +server_c.c:312:59: note: Assuming allocation function fails + size_t L=strlen(obj); size_t tot=L+2; char* arr=malloc(tot+1); size_t w=0; arr[w++]='['; memcpy(arr+w,obj,L); w+=L; arr[w++]=']'; arr[w]='\0'; write_file_all(file, arr, w); free(arr); + ^ +server_c.c:312:59: note: Assignment 'arr=malloc(tot+1)', assigned value is 0 + size_t L=strlen(obj); size_t tot=L+2; char* arr=malloc(tot+1); size_t w=0; arr[w++]='['; memcpy(arr+w,obj,L); w+=L; arr[w++]=']'; arr[w]='\0'; write_file_all(file, arr, w); free(arr); + ^ +server_c.c:312:169: note: Calling function 'write_file_all', 2nd argument 'arr' value is 0 + size_t L=strlen(obj); size_t tot=L+2; char* arr=malloc(tot+1); size_t w=0; arr[w++]='['; memcpy(arr+w,obj,L); w+=L; arr[w++]=']'; arr[w]='\0'; write_file_all(file, arr, w); free(arr); + ^ +server_c.c:42:105: note: Assuming condition is false +static int write_file_all(const char* path, const char* data, size_t len){ FILE* f=fopen(path,"wb"); if(!f) return -1; size_t n=fwrite(data,1,len,f); fclose(f); return n==len?0:-1; } + ^ +server_c.c:42:136: note: Null pointer dereference +static int write_file_all(const char* path, const char* data, size_t len){ FILE* f=fopen(path,"wb"); if(!f) return -1; size_t n=fwrite(data,1,len,f); fclose(f); return n==len?0:-1; } + ^ +server_c.c:64:21: warning: If memory allocation fails, then there is a possible null pointer dereference: p [nullPointerOutOfMemory] + while((p = strstr(p, qkey))){ + ^ +server_c.c:358:187: note: Assuming allocation function fails + for(; i (ssize_t)header_bytes ? (size_t)total - header_bytes : 0; + ^ +server_c.c:355:47: style: Variable 'L2' is assigned a value that is never used. [unreadVariable] + if(t[0] != '['){ free(file); size_t L2=2; send_response(c,200,"OK","application/json","[]",2,true); free(t); return; } + ^ +server_c.c:355:45: style: Variable 'L2' is assigned a value that is never used. [unreadVariable] + if(t[0] != '['){ free(file); size_t L2=2; send_response(c,200,"OK","application/json","[]",2,true); free(t); return; } + ^ +server_c.c:76:93: warning: If memory allocation fails, then there is a possible null pointer dereference: json [ctunullpointerOutOfMemory] +static long long json_get_number(const char* json, const char* key){ const char* p = strstr(json, key); if(!p) return 0; const char* colon=strchr(p,':'); if(!colon) return 0; const char* v=colon+1; while(*v==' '||*v=='\t') v++; return atoll(v); } + ^ +server_c.c:358:187: note: Assuming allocation function fails + for(; i=0?0:-1; } + ^ +nofile:0:0: information: Active checkers: 117/966 (use --checkers-report= to see details) [checkersReport] + diff --git a/articles/server_c.c b/articles/server_c.c index 85bf592..b991794 100644 --- a/articles/server_c.c +++ b/articles/server_c.c @@ -23,7 +23,7 @@ static const char *DOC_ROOT = NULL; // current working directory static void on_sigint(int sig){ (void)sig; g_stop = 1; } -static long long now_ms(){ struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); return (long long)ts.tv_sec*1000 + ts.tv_nsec/1000000; } +static long long now_ms(void){ struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); return (long long)ts.tv_sec*1000 + ts.tv_nsec/1000000; } static const char* getenv_default(const char* k, const char* def){ const char* v=getenv(k); return v&&*v? v: def; } @@ -32,16 +32,16 @@ static int ensure_dir(const char* path){ struct stat st; if(stat(path,&st)==0){ static char* path_join(const char* a, const char* b){ size_t la=strlen(a), lb=strlen(b); size_t n=la+1+lb+1; char* r=malloc(n); if(!r) return NULL; snprintf(r,n,"%s/%s",a,b); return r; } -static char* data_dir(){ const char* env = getenv("ARTICLES_DATA_DIR"); if(env && *env){ ensure_dir(env); return strdup(env); } char* d = path_join(DOC_ROOT?DOC_ROOT: ".", "data"); if(d){ ensure_dir(d); } return d; } +static char* data_dir(void){ const char* env = getenv("ARTICLES_DATA_DIR"); if(env && *env){ ensure_dir(env); return strdup(env); } char* d = path_join(DOC_ROOT?DOC_ROOT: ".", "data"); if(d){ ensure_dir(d); } return d; } -static char* data_file(){ char* d = data_dir(); if(!d) return NULL; char* f = path_join(d, "articles.json"); free(d); return f; } +static char* data_file(void){ char* d = data_dir(); if(!d) return NULL; char* f = path_join(d, "articles.json"); free(d); return f; } // Read entire file into memory (NUL-terminated). Caller frees. static char* read_file_all(const char* path, size_t* out_len){ FILE* f=fopen(path,"rb"); if(!f){ if(out_len) *out_len=0; return NULL; } fseek(f,0,SEEK_END); long sz=ftell(f); if(sz<0) sz=0; fseek(f,0,SEEK_SET); char* buf=malloc((size_t)sz+1); if(!buf){ fclose(f); return NULL; } size_t n=fread(buf,1,(size_t)sz,f); fclose(f); buf[n]='\0'; if(out_len) *out_len=n; return buf; } static int write_file_all(const char* path, const char* data, size_t len){ FILE* f=fopen(path,"wb"); if(!f) return -1; size_t n=fwrite(data,1,len,f); fclose(f); return n==len?0:-1; } -static int append_file_line(const char* path, const char* line){ FILE* f=fopen(path,"ab"); if(!f) return -1; size_t n=fwrite(line,1,strlen(line),f); n+=fwrite("\n",1,1,f); fclose(f); return (int)n>=0?0:-1; } +// removed unused append_file_line (lint) // ---- JSON helpers (minimal) ---- static char* json_escape(const char* s){ size_t n=0; for(const char* p=s; *p; ++p){ if(*p=='"'||*p=='\\'||*p=='\n'||*p=='\r'||*p=='\t') n+=2; else n++; } @@ -64,13 +64,19 @@ static char* json_get_string(const char* json, const char* key){ while((p = strstr(p, qkey))){ const char* colon = strchr(p + klen, ':'); if(!colon){ p += klen; continue; } const char* v = colon + 1; while(*v==' '||*v=='\t') v++; - if(*v!='"'){ if(tmp) free(tmp); return strdup(""); } + if(*v!='"'){ + if(tmp) free(tmp); + return strdup(""); + } v++; // inside string char* out = malloc(strlen(v)+1); if(!out){ if(tmp) free(tmp); return strdup(""); } size_t w=0; bool esc=false; for(const char* q=v; *q; ++q){ char c=*q; if(esc){ if(c=='"'||c=='\\'||c=='/'){ out[w++]=c; } else if(c=='n'){ out[w++]='\n'; } else if(c=='r'){ out[w++]='\r'; } else if(c=='t'){ out[w++]='\t'; } else { out[w++]=c; } esc=false; continue; } if(c=='\\'){ esc=true; continue; } if(c=='"'){ out[w]='\0'; if(tmp) free(tmp); return out; } out[w++]=c; } - free(out); if(tmp) free(tmp); return strdup(""); + free(out); + if(tmp) free(tmp); + return strdup(""); } - if(tmp) free(tmp); return strdup(""); + if(tmp) free(tmp); + return strdup(""); } static long long json_get_number(const char* json, const char* key){ const char* p = strstr(json, key); if(!p) return 0; const char* colon=strchr(p,':'); if(!colon) return 0; const char* v=colon+1; while(*v==' '||*v=='\t') v++; return atoll(v); } @@ -88,19 +94,34 @@ static char* json_get_top_string(const char* json, const char* key){ if(*p=='}' || !*p) break; if(*p!='"'){ // invalid // skip token to next comma or end - while(*p && *p!=',' && *p!='}') p++; - if(*p==',') { p++; continue; } else break; + while(*p && *p!=',' && *p!='}') { + p++; + } + if(*p==',') { + p++; + continue; + } else { + break; + } } // parse key string p++; const char* ks=p; size_t klen=0; bool esc=false; for(; *p; ++p){ char c=*p; if(esc){ esc=false; continue; } if(c=='\\'){ esc=true; continue; } if(c=='"'){ break; } klen++; } - const char* key_start=ks; const char* key_end=p; if(*p=='"') p++; while(*p==' '||*p=='\t') p++; if(*p!=':') { // malformed - while(*p && *p!=',' && *p!='}') p++; if(*p==',') { p++; continue; } else break; + const char* key_start=ks; if(*p=='"') p++; while(*p==' '||*p=='\t') p++; if(*p!=':') { // malformed + while(*p && *p!=',' && *p!='}') { + p++; + } + if(*p==',') { + p++; + continue; + } else { + break; + } } p++; while(*p==' '||*p=='\t') p++; int key_match = (klen==keylen) && (strncmp(key_start, key, keylen)==0); if(*p=='"'){ p++; // read string value - char* out = malloc(strlen(p)+1); if(!out) return strdup(""); size_t w=0; bool e=false; for(; *p; ++p){ char c=*p; if(e){ if(c=='"'||c=='\\'||c=='/'){ out[w++]=c; } else if(c=='n'){ out[w++]='\n'; } else if(c=='r'){ out[w++]='\r'; } else if(c=='t'){ out[w++]='\t'; } else { out[w++]=c; } e=false; continue; } if(c=='\\'){ e=true; continue; } if(c=='"'){ out[w]='\0'; p++; break; } out[w++]=c; } + char* out = malloc(strlen(p)+1); if(!out) return strdup(""); size_t w=0; bool e=false; for(; *p; ++p){ char c=*p; if(e){ if(c=='"'||c=='\\'||c=='/'){ out[w++]=c; } else if(c=='n'){ out[w++]='\n'; } else if(c=='r'){ out[w++]='\r'; } else if(c=='t'){ out[w++]='\t'; } else { out[w++]=c; } e=false; continue; } if(c=='\\'){ e=true; continue; } if(c=='"'){ out[w]='\0'; p++; break; } out[w++]=c; } if(key_match){ return out; } else { free(out); } } else { // non-string value: skip until comma or end (simple) @@ -124,48 +145,144 @@ static char* build_article_json(const char* id, const char* title, const char* a free(et); free(eau); free(eb); free(eth); return out; } -static char* gen_id(){ char* out=malloc(17); if(!out) return NULL; unsigned int r = (unsigned int)rand(); long long t=now_ms(); snprintf(out,17,"%08x%08x", (unsigned int)(t&0xffffffff), r); return out; } +static char* gen_id(void){ char* out=malloc(17); if(!out) return NULL; unsigned int r = (unsigned int)rand(); long long t=now_ms(); snprintf(out,17,"%08x%08x", (unsigned int)(t&0xffffffff), r); return out; } // ---- data URL handling ---- static int b64val(int c){ if(c>='A'&&c<='Z') return c-'A'; if(c>='a'&&c<='z') return c-'a'+26; if(c>='0'&&c<='9') return c-'0'+52; if(c=='+') return 62; if(c=='/') return 63; return -1; } -static unsigned char* base64_decode(const char* s, size_t len, size_t* out_len){ size_t pad=0; if(len>=1 && s[len-1]=='=') pad++; if(len>=2 && s[len-2]=='=') pad++; size_t outcap = (len/4)*3 - pad; unsigned char* out = malloc(outcap+1); if(!out) return NULL; size_t w=0; int val=0, valb=-8; for(size_t i=0;i=0){ out[w++] = (unsigned char)((val>>valb)&0xFF); valb-=8; } } if(out_len) *out_len=w; return out; } +static unsigned char* base64_decode(const char* s, size_t len, size_t* out_len){ + size_t pad=0; + if(len>=1 && s[len-1]=='=') pad++; + if(len>=2 && s[len-2]=='=') pad++; + size_t groups = len/4; + size_t outcap = groups*3; + if(pad <= outcap) outcap -= pad; else outcap = 0; + if(outcap==0) outcap=1; // avoid 0-byte malloc and make room for NUL + unsigned char* out = malloc(outcap+1); + if(!out) return NULL; + size_t w=0; int val=0, valb=-8; + for(size_t i=0;i=0){ out[w++] = (unsigned char)((val>>valb)&0xFF); valb-=8; } + } + if(out_len) *out_len=w; + return out; +} static int parse_data_url(const char* data_url, char** out_mime, unsigned char** out_bytes, size_t* out_len){ const char* p=data_url; if(strncmp(p,"data:",5)!=0) return -1; p+=5; const char* semi=strchr(p,';'); const char* comma=strchr(p,','); if(!comma) return -1; char* mime=NULL; int is_b64=0; if(semi && semioutcap){ outcap=w+L+1; out=realloc(out,outcap); if(!out) return NULL; } memcpy(out+w,p,L); w+=L; break; } +static char* migrate_inline_images_in_body(const char* body, bool* changed){ + if(!body) return NULL; + const char* p = body; + size_t outcap = strlen(body) + 1; + char* out = malloc(outcap); + if(!out) return NULL; + size_t w = 0; int did = 0; + while(*p){ + const char* m = strstr(p, "src=\""); + const char* m2 = strstr(p, "src='"); + const char* hit = NULL; char quote='\0'; + if(m && (!m2 || m < m2)){ hit = m; quote='\"'; } + else if(m2){ hit = m2; quote='\''; } + if(!hit){ + size_t L = strlen(p); + if(w + L + 1 > outcap){ + size_t newcap = w + L + 1; + void* tmp = realloc(out, newcap); + if(!tmp){ free(out); return NULL; } + out = tmp; + } + memcpy(out + w, p, L); + w += L; + break; + } // copy up to src= - size_t prefix_len=(size_t)(hit - p); if(w+prefix_len+6>outcap){ outcap=w+prefix_len+64; out=realloc(out,outcap); if(!out) return NULL; } memcpy(out+w,p,prefix_len); w+=prefix_len; memcpy(out+w, "src=\"", 5); w+=5; // normalize to double quote - const char* url_start = hit + 5; if(quote=='\''){ url_start = hit + 5; } - if(*url_start=='\''||*url_start=='\"') url_start++; - const char* url_end=strchr(url_start, quote=='\''?'\'':'\"'); if(!url_end){ // malformed; copy rest - size_t L=strlen(url_start); if(w+L+1>outcap){ outcap=w+L+1; out=realloc(out,outcap); if(!out) return NULL; } memcpy(out+w,url_start,L); w+=L; break; } - size_t url_len=(size_t)(url_end - url_start); - if(url_len>5 && !strncmp(url_start, "data:",5)){ - char* mime=NULL; unsigned char* bytes=NULL; size_t bl=0; char* urlbuf=strndup(url_start,url_len); - if(parse_data_url(urlbuf,&mime,&bytes,&bl)==0){ const char* ext=ext_from_mime(mime); char* saved=save_bytes_with_ext(bytes,bl,ext); if(saved){ const char* rel=saved; const char* prefix="/"; size_t need=strlen(prefix)+strlen(rel); if(w+need+1>outcap){ outcap=w+need+64; out=realloc(out,outcap); if(!out){ free(saved); free(bytes); free(mime); free(urlbuf); return NULL; } } - out[w++]='/'; memcpy(out+w, rel, strlen(rel)); w+=strlen(rel); did=1; free(saved); } + size_t prefix_len = (size_t)(hit - p); + if(w + prefix_len + 6 > outcap){ + size_t newcap = w + prefix_len + 64; + void* tmp = realloc(out, newcap); + if(!tmp){ free(out); return NULL; } + out = tmp; outcap = newcap; + } + memcpy(out + w, p, prefix_len); + w += prefix_len; + memcpy(out + w, "src=\"", 5); + w += 5; // normalize to double quote + const char* url_start = hit + 5; + if(*url_start=='\'' || *url_start=='"') url_start++; + const char endq = (quote=='\'') ? '\'' : '"'; + const char* url_end = strchr(url_start, endq); + if(!url_end){ // malformed; copy rest + size_t L = strlen(url_start); + if(w + L + 1 > outcap){ + size_t newcap = w + L + 1; + void* tmp = realloc(out, newcap); + if(!tmp){ free(out); return NULL; } + out = tmp; + } + memcpy(out + w, url_start, L); + w += L; + break; + } + size_t url_len = (size_t)(url_end - url_start); + if(url_len>5 && strncmp(url_start, "data:", 5)==0){ + char* mime = NULL; unsigned char* bytes = NULL; size_t bl = 0; char* urlbuf = strndup(url_start, url_len); + if(parse_data_url(urlbuf,&mime,&bytes,&bl)==0){ + const char* ext = ext_from_mime(mime); + char* saved = save_bytes_with_ext(bytes, bl, ext); + if(saved){ + const char* rel = saved; + size_t need = 1 + strlen(rel); + if(w + need + 1 > outcap){ + size_t newcap = w + need + 64; + void* tmp = realloc(out, newcap); + if(!tmp){ free(saved); free(bytes); free(mime); free(urlbuf); free(out); return NULL; } + out = tmp; outcap = newcap; + } + out[w++] = '/'; + memcpy(out + w, rel, strlen(rel)); + w += strlen(rel); + did = 1; + free(saved); + } } free(bytes); free(mime); free(urlbuf); } else { - if(w+url_len+1>outcap){ outcap=w+url_len+64; out=realloc(out,outcap); if(!out) return NULL; } memcpy(out+w,url_start,url_len); w+=url_len; + if(w + url_len + 1 > outcap){ + size_t newcap = w + url_len + 64; + void* tmp = realloc(out, newcap); + if(!tmp){ free(out); return NULL; } + out = tmp; outcap = newcap; + } + memcpy(out + w, url_start, url_len); + w += url_len; } // closing quote - if(w+1>outcap){ outcap=w+64; out=realloc(out,outcap); if(!out) return NULL; } - out[w++]='"'; + if(w + 1 > outcap){ + size_t newcap = w + 64; + void* tmp = realloc(out, newcap); + if(!tmp){ free(out); return NULL; } + out = tmp; outcap = newcap; + } + out[w++] = '"'; p = url_end + 1; } - out[w]='\0'; if(changed) *changed=did; return out; } + out[w] = '\0'; + if(changed) *changed = did; + return out; +} // ---- HTTP helpers ---- -static void send_str(int c, const char* s){ send(c, s, strlen(s), 0); } +// removed unused send_str (lint) static void send_response(int c, int code, const char* status, const char* ctype, const char* body, size_t blen, bool cors){ char head[SMALL_BUF]; @@ -182,24 +299,14 @@ static const char* guess_mime(const char* path){ const char* ext=strrchr(path,'. // ---- Data operations (NDJSON-style internal), exposed as JSON array ---- static char* ltrim_dup(const char* s){ while(*s && isspace((unsigned char)*s)) s++; return strdup(s); } -static char* list_articles_json(size_t* out_len){ - char* file=data_file(); if(!file){ return strdup("[]"); } - size_t n=0; char* content=read_file_all(file,&n); free(file); - if(!content||n==0){ free(content); if(out_len) *out_len=2; return strdup("[]"); } - char* t=ltrim_dup(content); free(content); - if(!t){ if(out_len) *out_len=2; return strdup("[]"); } - // If already a JSON array, return as-is - if(t[0]=='['){ if(out_len) *out_len=strlen(t); return t; } - // Otherwise, treat as empty - free(t); if(out_len) *out_len=2; return strdup("[]"); -} +// removed unused list_articles_json (lint) static char* find_article_by_id(const char* id){ char* file=data_file(); if(!file) return NULL; size_t n=0; char* content=read_file_all(file,&n); free(file); if(!content) return NULL; char* t=ltrim_dup(content); free(content); if(!t) return NULL; if(t[0] != '['){ free(t); return NULL; } // iterate objects - size_t len=strlen(t); size_t i=1; int depth=0; size_t start=0; for(; i=2 && tcontent[0]=='[' && tcontent[clen-1]==']'){ + char* tcontent=ltrim_dup(content); free(content); if(tcontent && tcontent[0]=='['){ size_t clen=strlen(tcontent); if(clen>=2 && tcontent[clen-1]==']'){ // insert at front - bool empty = (clen==2); - size_t Lobj=strlen(obj); - size_t newlen = 1 + Lobj + (empty?0:1) + (clen-2) + 1; - char* out=malloc(newlen+1); size_t w=0; out[w++]='['; memcpy(out+w,obj,Lobj); w+=Lobj; if(!empty){ out[w++]=','; memcpy(out+w, tcontent+1, clen-2); w+=(clen-2); } out[w++]=']'; out[w]='\0'; write_file_all(file, out, w); free(out); + bool empty = (clen==2); + size_t Lobj=strlen(obj); + size_t newlen = 1 + Lobj + (empty?0:1) + (clen-2) + 1; + char* out=malloc(newlen+1); if(out){ size_t w=0; out[w++]='['; memcpy(out+w,obj,Lobj); w+=Lobj; if(!empty){ out[w++]=','; memcpy(out+w, tcontent+1, clen-2); w+=(clen-2); } out[w++]=']'; out[w]='\0'; write_file_all(file, out, w); free(out); } } else { // corrupt; overwrite - size_t L=strlen(obj); size_t tot=L+2; char* arr=malloc(tot+1); size_t w=0; arr[w++]='['; memcpy(arr+w,obj,L); w+=L; arr[w++]=']'; arr[w]='\0'; write_file_all(file, arr, w); free(arr); + size_t L=strlen(obj); size_t tot=L+2; char* arr=malloc(tot+1); if(arr){ size_t w=0; arr[w++]='['; memcpy(arr+w,obj,L); w+=L; arr[w++]=']'; arr[w]='\0'; write_file_all(file, arr, w); free(arr); } } } else { // not an array; overwrite - size_t L=strlen(obj); size_t tot=L+2; char* arr=malloc(tot+1); size_t w=0; arr[w++]='['; memcpy(arr+w,obj,L); w+=L; arr[w++]=']'; arr[w]='\0'; write_file_all(file, arr, w); free(arr); + size_t L=strlen(obj); size_t tot=L+2; char* arr=malloc(tot+1); if(arr){ size_t w=0; arr[w++]='['; memcpy(arr+w,obj,L); w+=L; arr[w++]=']'; arr[w]='\0'; write_file_all(file, arr, w); free(arr); } } free(tcontent); } - free(content); free(file); free(id); return obj; } + // persist done; return created object JSON + free(file); + free(id); + return obj; +} // ---- request handling ---- static const char* ext_from_content_type(const char* ct){ if(!ct) return NULL; if(strstr(ct,"image/png")) return "png"; if(strstr(ct,"image/jpeg")) return "jpg"; if(strstr(ct,"image/jpg")) return "jpg"; if(strstr(ct,"image/webp")) return "webp"; if(strstr(ct,"image/gif")) return "gif"; return NULL; } @@ -286,36 +402,41 @@ static void handle_api(int c, const char* method, const char* path, const char* char* file=data_file(); if(!file){ send_response(c,200,"OK","application/json","[]",2,true); return; } size_t n=0; char* content=read_file_all(file,&n); if(!content){ free(file); send_response(c,200,"OK","application/json","[]",2,true); return; } char* t=ltrim_dup(content); free(content); if(!t){ free(file); send_response(c,200,"OK","application/json","[]",2,true); return; } - if(t[0] != '['){ free(file); size_t L2=2; send_response(c,200,"OK","application/json","[]",2,true); free(t); return; } + if(t[0] != '['){ free(file); send_response(c,200,"OK","application/json","[]",2,true); free(t); return; } // iterate and rebuild array - size_t len=strlen(t); size_t i=1; int depth=0; size_t start=0; size_t count=0, cap=8; char** objs=malloc(cap*sizeof(char*)); int changed=0; - for(; ibl+1){ const char* id=path+bl+1; char* obj=find_article_by_id(id); if(!obj){ send_response(c,404,"Not Found","application/json","",0,true); return;} // migrate this object if needed char* title=json_get_string(obj, "title"); char* author=json_get_string(obj, "author"); char* body_s=json_get_string(obj, "body"); char* thumb=json_get_string(obj, "thumb"); long long createdAt=json_get_number(obj, "\"createdAt\""); int obj_changed=0; - if(thumb && strncmp(thumb, "data:",5)==0){ char* mime=NULL; unsigned char* bytes=NULL; size_t bl2=0; if(parse_data_url(thumb,&mime,&bytes,&bl2)==0){ const char* ext=ext_from_mime(mime); char* saved=save_bytes_with_ext(bytes,bl2,ext); if(saved){ free(thumb); size_t urlL=strlen(saved)+2; thumb=malloc(urlL); snprintf(thumb,urlL,"/%s",saved); free(saved); obj_changed=1; } free(mime); free(bytes); } } + if(thumb && strncmp(thumb, "data:",5)==0){ char* mime=NULL; unsigned char* bytes=NULL; size_t bl2=0; if(parse_data_url(thumb,&mime,&bytes,&bl2)==0){ const char* ext=ext_from_mime(mime); char* saved=save_bytes_with_ext(bytes,bl2,ext); if(saved){ size_t urlL=strlen(saved)+2; char* newthumb=malloc(urlL); if(newthumb){ snprintf(newthumb,urlL,"/%s",saved); free(thumb); thumb=newthumb; obj_changed=1; } free(saved); } free(mime); free(bytes); } } bool bchanged=false; char* new_body=migrate_inline_images_in_body(body_s,&bchanged); if(new_body && bchanged){ free(body_s); body_s=new_body; obj_changed=1; } else { free(new_body); } if(obj_changed){ char* id_copy=json_get_string(obj, "id"); char* updated=build_article_json(id_copy?id_copy:"", title?title:"", author?author:"", body_s?body_s:"", thumb?thumb:"", createdAt, 0); // persist if(updated){ rewrite_articles_map(NULL, id_copy, updated, false); free(updated); } @@ -339,10 +460,10 @@ static void handle_api(int c, const char* method, const char* path, const char* // /api/upload for binary image upload if(!strncmp(path, "/api/upload", 12)){ if(!strcmp(method,"POST")){ - const char* ext_q = get_qparam(path, "ext"); const char* dot = NULL; const char* ext_from_ct = ext_from_content_type(content_type); + const char* ext_q = get_qparam(path, "ext"); const char* ext_from_ct = ext_from_content_type(content_type); const char* ext = ext_from_ct ? ext_from_ct : (ext_q ? ext_q : "bin"); // trim ext to safe token - size_t elen=0; while(ext[elen] && elen<8 && isalnum((unsigned char)ext[elen])) elen++; char* ext_safe=strndup_local(ext,elen?elen:3); if(!ext_safe){ send_response(c,500,"Internal Server Error","application/json","",0,true); return; } + size_t elen=0; while(elen<4 && ext[elen] && isalnum((unsigned char)ext[elen])) elen++; char* ext_safe=strndup_local(ext,elen?elen:3); if(!ext_safe){ send_response(c,500,"Internal Server Error","application/json","",0,true); return; } char* saved = save_upload(body, blen, ext_safe); free(ext_safe); if(!saved){ send_response(c,500,"Internal Server Error","application/json","",0,true); return; } // build URL @@ -359,7 +480,12 @@ static void handle_api(int c, const char* method, const char* path, const char* static bool safe_path(const char* p){ if(strstr(p, "..")) return false; return true; } static void handle_static(int c, const char* path){ - char rel[SMALL_BUF]; if(!strcmp(path,"/")) strncpy(rel,"/index.html",sizeof(rel)); else strncpy(rel,path,sizeof(rel)); rel[sizeof(rel)-1]='\0'; + char rel[SMALL_BUF]; + if(!strcmp(path,"/")){ + snprintf(rel, sizeof(rel), "%s", "/index.html"); + } else { + snprintf(rel, sizeof(rel), "%s", path); + } if(!safe_path(rel)){ send_response(c,403,"Forbidden","text/plain","Forbidden",9,false); return; } // build abs path char full[SMALL_BUF*2]; snprintf(full,sizeof(full),"%s%s", DOC_ROOT?DOC_ROOT:".", rel); @@ -389,12 +515,12 @@ static void handle_client(int c){ if(total<=0){ close(c); return; } // parse request line char method[16]={0}, path[SMALL_BUF]={0}; - sscanf(buf, "%15s %1023s", method, path); + if(sscanf(buf, "%15s %4095s", method, path) < 2){ close(c); return; } // headers - size_t content_length=0; char* cl = strcasestr(buf, "Content-Length:"); if(cl){ content_length = strtoul(cl+15, NULL, 10); } - char* ct_hdr = strcasestr(buf, "Content-Type:"); char ctype[128]={0}; if(ct_hdr){ ct_hdr+=13; while(*ct_hdr==' '||*ct_hdr=='\t') ct_hdr++; size_t i=0; while(*ct_hdr && *ct_hdr!='\r' && *ct_hdr!='\n' && i (ssize_t)header_bytes ? (size_t)total - header_bytes : 0; + const char* hdr_end = strstr(buf, "\r\n\r\n"); size_t header_bytes = hdr_end? (size_t)(hdr_end - buf) + 4 : (size_t)total; size_t have_body = total > (ssize_t)header_bytes ? (size_t)total - header_bytes : 0; char* body = NULL; if(content_length){ body = malloc(content_length+1); if(!body){ close(c); return; } size_t off=0; if(have_body){ size_t cpy = have_body>content_length?content_length:have_body; memcpy(body, buf+header_bytes, cpy); off = cpy; } size_t remain = content_length - off; while(remain>0){ ssize_t rr = recv(c, body+off, remain, 0); if(rr<=0) break; off+=rr; remain-=rr; } body[content_length]='\0'; } @@ -412,6 +538,7 @@ static void handle_client(int c){ } int main(int argc, char** argv){ + (void)argc; (void)argv; signal(SIGINT, on_sigint); srand((unsigned int)time(NULL)); char cwd[SMALL_BUF]; if(getcwd(cwd,sizeof(cwd))) DOC_ROOT=strdup(cwd); @@ -420,7 +547,7 @@ int main(int argc, char** argv){ int s = socket(AF_INET, SOCK_STREAM, 0); if(s<0){ perror("socket"); return 1; } int opt=1; setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); - struct sockaddr_in addr; memset(&addr,0,sizeof(addr)); addr.sin_family=AF_INET; addr.sin_port=htons((uint16_t)port); addr.sin_addr.s_addr=inet_addr(host); + struct sockaddr_in addr = {0}; addr.sin_family=AF_INET; addr.sin_port=htons((uint16_t)port); addr.sin_addr.s_addr=inet_addr(host); if(bind(s,(struct sockaddr*)&addr,sizeof(addr))<0){ perror("bind"); close(s); return 1; } if(listen(s,64)<0){ perror("listen"); close(s); return 1; } printf("Serving Mini Articles (C) on http://%s:%d\n", host, port);