]> git.deb.at Git - pkg/abook.git/blob - debian/patches/01_search_ctrl-d_segfault_fix
Imported Debian patch 0.5.6-6
[pkg/abook.git] / debian / patches / 01_search_ctrl-d_segfault_fix
1 Author: Cedric Duval <cedricduval@free.fr>      vim:ft=diff:
2 Description: Don't let ctrl-d in search segfault abook (closes: #462145)
3
4 Index: abook-0.5.6/ui.c
5 ===================================================================
6 --- abook-0.5.6.orig/ui.c
7 +++ abook-0.5.6/ui.c
8 @@ -569,9 +569,13 @@ ui_find(int next)
9         } else {
10                 char *s;
11                 s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0);
12 -               strncpy(findstr, s, MAX_FIELD_LEN);
13 -               free(s);
14                 refresh_screen();
15 +               if(s == NULL) {
16 +                       return; /* user cancelled (ctrl-G) */
17 +               } else {
18 +                       strncpy(findstr, s, MAX_FIELD_LEN);
19 +                       free(s);
20 +               }
21         }
22  
23         if( (item = find_item(findstr, curitem + !!next, search_fields)) < 0 &&