Do not crash if problem to access MC clipboard

This commit is contained in:
Alexander S. Aganichev 2003-01-18 15:29:45 +00:00
parent 9dac8c18b8
commit c0439363f6
2 changed files with 12 additions and 7 deletions

View File

@ -12,6 +12,8 @@ ______________________________________________________________________
Notes for GoldED+ 1.1.5, /snapshot/
______________________________________________________________________
- Do not crash if problem to access MC clipboard (Linux specific).
- To fix problem with related pathname in NODEPATH the Goldnode will
write only filename in .gxl file. Most users should not notice this
change at all.

View File

@ -105,14 +105,17 @@ char* g_get_clip_text(void) {
std::string clipfile = CLIPFILE;
strschg_environ(clipfile);
size_t size = GetFilesize(clipfile.c_str());
char *text = (char *)throw_malloc(size+1);
*text = NUL;
FILE *f = fopen(clipfile.c_str(), "rt");
if(f != NULL) {
fread(text, 1, size, f);
text[size] = NUL;
fclose(f);
if(size != -1) {
char *text = (char *)throw_malloc(size+1);
*text = NUL;
FILE *f = fopen(clipfile.c_str(), "rt");
if(f != NULL) {
fread(text, 1, size, f);
text[size] = NUL;
fclose(f);
}
}
return text;