diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2005-10-26 09:08:01 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2005-10-26 09:08:01 +0000 |
| commit | 77484a4e2d9d3e8ab82855b2b3baf0bbe7e81ba5 (patch) | |
| tree | b36b9541b2f71af67625da5378f03c429aaea39c /fluid | |
| parent | cf296e05655e1282cbf5a9bc5bfdfd2f4480e662 (diff) | |
FLUID writes RGB and Bitmap image data as an array of decimal numbers instead of a string since "a certain compiler by a large operating system vendor which shall remain unnamed" can not handle long strings and produces heap overflows.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4607 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Fl_Type.h | 1 | ||||
| -rw-r--r-- | fluid/Fluid_Image.cxx | 4 | ||||
| -rw-r--r-- | fluid/code.cxx | 19 |
3 files changed, 22 insertions, 2 deletions
diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h index 9f8f98d2b..e76368c08 100644 --- a/fluid/Fl_Type.h +++ b/fluid/Fl_Type.h @@ -732,6 +732,7 @@ void write_c(const char*, ...) __fl_attr((__format__ (__printf__, 1, 2))); void write_h(const char*, ...) __fl_attr((__format__ (__printf__, 1, 2))); void write_cstring(const char *); void write_cstring(const char *,int length); +void write_cdata(const char *,int length); void write_indent(int n); void write_open(int); void write_close(int n); diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx index 8ceaae003..fba6a9f9c 100644 --- a/fluid/Fluid_Image.cxx +++ b/fluid/Fluid_Image.cxx @@ -94,7 +94,7 @@ void Fluid_Image::write_static() { } write_c("static unsigned char %s[] =\n", unique_id(this, "idata", fl_filename_name(name()), 0)); - write_cstring(img->data()[0], ((img->w() + 7) / 8) * img->h()); + write_cdata(img->data()[0], ((img->w() + 7) / 8) * img->h()); write_c(";\n"); write_c("static Fl_Bitmap %s(%s, %d, %d);\n", unique_id(this, "image", fl_filename_name(name()), 0), @@ -109,7 +109,7 @@ void Fluid_Image::write_static() { } write_c("static unsigned char %s[] =\n", unique_id(this, "idata", fl_filename_name(name()), 0)); - write_cstring(img->data()[0], (img->w() * img->d() + img->ld()) * img->h()); + write_cdata(img->data()[0], (img->w() * img->d() + img->ld()) * img->h()); write_c(";\n"); write_c("static Fl_RGB_Image %s(%s, %d, %d, %d, %d);\n", unique_id(this, "image", fl_filename_name(name()), 0), diff --git a/fluid/code.cxx b/fluid/code.cxx index afbbfd586..d50f37fd9 100644 --- a/fluid/code.cxx +++ b/fluid/code.cxx @@ -226,6 +226,25 @@ void write_cstring(const char *w, int length) { // write a C string, quoting characters if necessary: void write_cstring(const char *w) {write_cstring(w,strlen(w));} +// write an array of C binary data (does not add a null): +void write_cdata(const char *s, int length) { + if (varused_test) return; + const unsigned char *w = (const unsigned char *)s; + const unsigned char *e = w+length; + int linelength = 1; + putc('{', code_file); + for (; w < e;) { + unsigned char c = *w++; + if (c>99) linelength += 4; + else if (c>9) linelength += 3; + else linelength += 2; + if (linelength >= 77) {fputs("\n",code_file); linelength = 0;} + fprintf(code_file, "%d", c); + if (w<e) putc(',', code_file); + } + putc('}', code_file); +} + void write_c(const char* format,...) { if (varused_test) {varused = 1; return;} va_list args; |