vtorri
/
terminology
forked from enlightenment/terminology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

termio selection strings - fix ownership and alloc/free 

this was a bit of a mess in terms of who owns, dups, copies etc. so i
fixed this up a bit and have termio_take_selection_text consistently
stringshare_add the string as its own copy so it can free it later.
also fix leak from ty_sb_steal_buf() as this is a malloced buffer not
stringshared and it wasnt freed after a steal

@fix
This commit is contained in:
Carsten Haitzler 2020-05-04 10:47:00 +01:00
parent c29e2d428a
commit 0df36aefc9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/termio.c
View File

@ -901,7 +901,7 @@ termio_take_selection_text(Termio *sd, Elm_Sel_Type type, const char *text)
_lost_selection, sd->self);
sd->have_sel = EINA_TRUE;
eina_stringshare_del(sd->sel_str);
sd->sel_str = text;
sd->sel_str = eina_stringshare_add(text);
}
@ -945,15 +945,15 @@ _cb_ctxp_link_content_copy(void *data,
else
{
struct ty_sb sb = {.buf = NULL, .len = 0, .alloc = 0};
const char *raw_link;
char *raw_link;
termio_selection_get(sd,
sd->link.x1, sd->link.y1,
sd->link.x2, sd->link.y2,
&sb, EINA_FALSE);
raw_link = ty_sb_steal_buf(&sb);
termio_take_selection_text(sd, ELM_SEL_TYPE_CLIPBOARD, raw_link);
free(raw_link);
}
sd->ctxpopup = NULL;