X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Flibzmpeg3%2Flibzmpeg3.h;h=712d1ca00dffd62644651ff5d3b75c3d4ecbb05f;hb=8d1431081df60da0719db2c77e4c56830521c7e8;hp=e12321850a2cd1d2490ba8b7c71fcf219d3e88b9;hpb=235c9cc4df8306babbbfda46189108fe262d44ef;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/libzmpeg3/libzmpeg3.h b/cinelerra-5.1/libzmpeg3/libzmpeg3.h index e1232185..712d1ca0 100644 --- a/cinelerra-5.1/libzmpeg3/libzmpeg3.h +++ b/cinelerra-5.1/libzmpeg3/libzmpeg3.h @@ -94,7 +94,7 @@ extern "C" { #define new_memset(s) \ void *operator new(size_t n) { \ - void *t = (void*) new char[n]; \ + void * volatile t = (void*) new char[n]; \ memset(t,s,n); \ return t; \ } \ @@ -102,7 +102,7 @@ extern "C" { delete[](char*)t; \ } \ void *operator new[](size_t n) { \ - void *t = (void*) new char[n]; \ + void * volatile t = (void*) new char[n]; \ memset(t,s,n); \ return t; \ } \ @@ -2846,9 +2846,9 @@ public: } static inline void complete_path(char *full_path, char *path) { - char dir[zmpeg3_t::STRLEN]; + char dir[STRLEN]; if( path[0] != '/' && getcwd(dir, sizeof(dir)) ) - sprintf(full_path, "%s/%s", dir, path); + snprintf(full_path, STRLEN, "%s/%s", dir, path); else strcpy(full_path, path); } @@ -2875,7 +2875,7 @@ public: } static inline void joinpath(char *path, char *dir, char *filename) { - sprintf(path, "%s/%s", dir, filename); + snprintf(path, STRLEN, "%s/%s", dir, filename); } static inline int64_t path_total_bytes(char *path) {