Mercurial > vim

diff src/message_test.c @ 9581:716382aaa0c0 v7.4.2068

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/b9644433d2728e99fab874e5e33147ad95d23a31 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jul 19 12:33:44 2016 +0200 patch 7.4.2068 Problem: Not all arguments of trunc_string() are tested. Memory access error when running the message tests. Solution: Add another test case. (Yegappan Lakshmanan) Make it easy to run unittests with valgrind. Fix the access error.
author Christian Brabandt <cb@256bit.org>
date Tue, 19 Jul 2016 12:45:05 +0200
parents 00ee8d8c2e0c
children 4aead6a9b7a9
line wrap: on
line diff
--- a/src/message_test.c
+++ b/src/message_test.c
@@ -28,37 +28,69 @@
     static void
 test_trunc_string(void)
 {
-    char_u  buf[40];
+    char_u  *buf; /*allocated every time to find uninit errors */
+    char_u  *s;
 
     /* in place */
+    buf = alloc(40);
     STRCPY(buf, "text");
     trunc_string(buf, buf, 20, 40);
     assert(STRCMP(buf, "text") == 0);
+    vim_free(buf);
 
+    buf = alloc(40);
     STRCPY(buf, "a short text");
     trunc_string(buf, buf, 20, 40);
     assert(STRCMP(buf, "a short text") == 0);
+    vim_free(buf);
 
+    buf = alloc(40);
     STRCPY(buf, "a text tha just fits");
     trunc_string(buf, buf, 20, 40);
     assert(STRCMP(buf, "a text tha just fits") == 0);
+    vim_free(buf);
 
+    buf = alloc(40);
     STRCPY(buf, "a text that nott fits");
     trunc_string(buf, buf, 20, 40);
     assert(STRCMP(buf, "a text t...nott fits") == 0);
+    vim_free(buf);
 
     /* copy from string to buf */
-    trunc_string((char_u *)"text", buf, 20, 40);
+    buf = alloc(40);
+    s = vim_strsave((char_u *)"text");
+    trunc_string(s, buf, 20, 40);
     assert(STRCMP(buf, "text") == 0);
+    vim_free(buf);
+    vim_free(s);
 
-    trunc_string((char_u *)"a short text", buf, 20, 40);
-    assert(STRCMP(buf, "a short text") == 0);
+    buf = alloc(40);
+    s = vim_strsave((char_u *)"a text that fits");
+    trunc_string(s, buf, 34, 40);
+    assert(STRCMP(buf, "a text that fits") == 0);
+    vim_free(buf);
+    vim_free(s);
 
-    trunc_string((char_u *)"a text tha just fits", buf, 20, 40);
-    assert(STRCMP(buf, "a text tha just fits") == 0);
+    buf = alloc(40);
+    s = vim_strsave((char_u *)"a short text");
+    trunc_string(s, buf, 20, 40);
+    assert(STRCMP(buf, "a short text") == 0);
+    vim_free(buf);
+    vim_free(s);
 
-    trunc_string((char_u *)"a text that nott fits", buf, 20, 40);
+    buf = alloc(40);
+    s = vim_strsave((char_u *)"a text tha just fits");
+    trunc_string(s, buf, 20, 40);
+    assert(STRCMP(buf, "a text tha just fits") == 0);
+    vim_free(buf);
+    vim_free(s);
+
+    buf = alloc(40);
+    s = vim_strsave((char_u *)"a text that nott fits");
+    trunc_string(s, buf, 20, 40);
     assert(STRCMP(buf, "a text t...nott fits") == 0);
+    vim_free(buf);
+    vim_free(s);
 }
 
     int