Changeset d3c318b for fmtext.c

Timestamp:

Feb 4, 2011, 3:49:44 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

7e111f4

Parents:

dfe5829

git-author:

David Benjamin <davidben@mit.edu> (01/24/11 20:37:26)

git-committer:

David Benjamin <davidben@mit.edu> (02/04/11 15:49:44)

Message:

Don't stick random NULs when waddnstr exists

File:

• fmtext.c (modified) (2 diffs)

fmtext.c

@@ -301 +301 @@
       if (do_search && owl_global_is_search_active(&g)) {
         /* Search is active, so highlight search results. */
-        char tmp2;
         int start, end;
         while (owl_regex_compare(owl_global_get_search_re(&g), s, &start, &end) == 0) {
@@ -310 +309 @@
           /* Found search string, highlight it. */
 
-          tmp2 = s[start];
-          s[start] = '\0';
-          waddstr(w, s);
-          s[start] = tmp2;
+          waddnstr(w, s, start);
 
           _owl_fmtext_wattrset(w, attr ^ OWL_FMTEXT_ATTR_REVERSE);
           _owl_fmtext_wcolor_set(w, pair);
           
-          tmp2 = s[end];
-          s[end] = '\0';
-          waddstr(w, s + start);
-          s[end] = tmp2;
+          waddnstr(w, s + start, end - start);
 
           _owl_fmtext_wattrset(w, attr);