q66
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm_code: Fix Coverity issues. 

@fix CID1356612 CID1368335 CID1368489 CID1371123 CID1371124 CID1371126 CID1371128
This commit is contained in:
Andy Williams 2017-02-18 21:41:53 +00:00
parent 4054210990
commit 2c1aeef3d6
3 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/elementary/elm_code_file.c
View File

@ -192,8 +192,10 @@ EAPI void elm_code_file_save(Elm_Code_File *file)
elm_code_line_text_trailing_whitespace_strip(line_item);
content = elm_code_line_text_get(line_item, &length);
fwrite(content, sizeof(char), length, out);
fwrite(crchars, sizeof(char), crlength, out);
if (fwrite(content, sizeof(char), length, out) != length)
break;
if (fwrite(crchars, sizeof(char), crlength, out) != crlength)
break;
}
fclose(out);

25
src/lib/elementary/elm_code_indent.c
View File

@ -12,26 +12,29 @@ elm_code_line_indent_startswith_keyword(Elm_Code_Line *line)
{
regex_t regex;
char *text;
Eina_Bool ret;
int ret;
unsigned int textlen;
text = (char *)elm_code_line_text_get(line, &textlen);
text = strndup(text, textlen);
regcomp(&regex, "^\\s*("
"((if|else\\s*if|while|for|switch)\\s*\\(.*\\)\\s*\\{?)|"
"((else|do)\\s*\\{?)|"
"(case\\s+.+:)|"
"(default:)"
")\\s*$", REG_EXTENDED | REG_NOSUB);
ret = regcomp(&regex, "^\\s*("
"((if|else\\s*if|while|for|switch)\\s*\\(.*\\)\\s*\\{?)|"
"((else|do)\\s*\\{?)|"
"(case\\s+.+:)|"
"(default:)"
")\\s*$", REG_EXTENDED | REG_NOSUB);
if (ret)
{
regfree(&regex);
return EINA_FALSE;
}
ret = regexec(&regex, text, 0, NULL, 0);
regfree(&regex);
free(text);
if (ret == 0)
return EINA_TRUE;
else
return EINA_FALSE;
return ret == 0;
}
EAPI char *

19
src/lib/elementary/elm_code_widget.c
View File

@ -621,7 +621,7 @@ _elm_code_widget_position_at_coordinates_get(Eo *obj, Elm_Code_Widget_Data *pd,
Evas_Coord ox = 0, oy = 0, sx = 0, sy = 0, rowy = 0;
Evas_Object *grid;
int cw = 0, ch = 0, gutter;
unsigned int guess, number;
unsigned int guess = 0, number;
widget = (Elm_Code_Widget *)obj;
evas_object_geometry_get(widget, &ox, &oy, NULL, NULL);
@ -632,7 +632,8 @@ _elm_code_widget_position_at_coordinates_get(Eo *obj, Elm_Code_Widget_Data *pd,
_elm_code_widget_cell_size_get(widget, &cw, &ch);
gutter = elm_obj_code_widget_text_left_gutter_width_get(widget);
guess = ((double) y / ch) + 1;
if (ch > 0)
guess = ((double) y / ch) + 1;
number = guess;
// unfortunately EINA_LIST_REVERSE_FOREACH skips to the end of the list...
@ -649,7 +650,12 @@ _elm_code_widget_position_at_coordinates_get(Eo *obj, Elm_Code_Widget_Data *pd,
}
if (col)
*col = ((double) x / cw) - gutter + 1;
{
if (cw == 0)
*col = 0;
else
*col = ((double) x / cw) - gutter + 1;
}
if (row)
*row = number;
@ -1633,7 +1639,7 @@ _elm_code_widget_key_down_cb(void *data, Evas *evas EINA_UNUSED,
else if (!strcmp(ev->key, "Next"))
_elm_code_widget_cursor_move_pagedown(widget);
if (shift)
if (shift && pd->selection)
{
if (pd->selection->start_line == pd->selection->end_line)
adjust = (pd->selection->end_col > pd->selection->start_col) ||
@ -1918,7 +1924,8 @@ _elm_code_widget_resize(Elm_Code_Widget *widget, Elm_Code_Line *newline)
ww = w*cw;
if (h*ch > wh)
wh = h*ch;
pd->col_count = ww/cw + 1;
if (cw > 0)
pd->col_count = ww/cw + 1;
EINA_LIST_FOREACH(pd->grids, item, grid)
{
@ -1962,6 +1969,8 @@ _elm_code_widget_lines_visible_get(Eo *obj, Elm_Code_Widget_Data *pd)
elm_scroller_region_get(pd->scroller, NULL, NULL, NULL, &viewh);
_elm_code_widget_cell_size_get(obj, NULL, &cellh);
if (cellh == 0)
return 0;
return viewh / cellh + 1;
}