gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix char * issues with constant strings.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4575 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2005-09-19 12:06:09 +00:00
parent 6e88ede6a4
commit b303985d92
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Fl_Input.cxx
View File

@ -74,10 +74,10 @@ int Fl_Input::shift_up_down_position(int p) {
// of a decimal point). For back compatibility reasons, we always
// allow the decimal point.
#ifdef HAVE_LOCALECONV
static char *standard_fp_chars = ".eE+-";
static char *legal_fp_chars = 0L;
static const char *standard_fp_chars = ".eE+-";
static const char *legal_fp_chars = 0L;
#else
static char *legal_fp_chars = ".eE+-";
static const char *legal_fp_chars = ".eE+-";
#endif
int Fl_Input::handle_key() {
@ -106,16 +106,17 @@ int Fl_Input::handle_key() {
}
// the following line is not a true memory leak because the array is only
// allocated once if required, and automatically freed when the program quits
legal_fp_chars = (char*)malloc(len+1);
strcpy(legal_fp_chars, standard_fp_chars);
char *chars = (char*)malloc(len+1);
legal_fp_chars = chars;
strcpy(chars, standard_fp_chars);
if (lc) {
if (lc->decimal_point) strcat(legal_fp_chars, lc->decimal_point);
if (lc->mon_decimal_point) strcat(legal_fp_chars, lc->mon_decimal_point);
if (lc->positive_sign) strcat(legal_fp_chars, lc->positive_sign);
if (lc->negative_sign) strcat(legal_fp_chars, lc->negative_sign);
if (lc->decimal_point) strcat(chars, lc->decimal_point);
if (lc->mon_decimal_point) strcat(chars, lc->mon_decimal_point);
if (lc->positive_sign) strcat(chars, lc->positive_sign);
if (lc->negative_sign) strcat(chars, lc->negative_sign);
}
}
#endif
#endif // HAVE_LOCALECONV
// This is complex to allow "0xff12" hex to be typed:
if (!position() && (ascii == '+' || ascii == '-') ||