From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 13 Apr 2015 12:45:27 +0000 (+0200)
Subject: patch 7.4.695
X-Git-Tag: v7.4.695
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c94ce910f07e0d76d66b46bccfe39a07d8e1f6d;p=vim

patch 7.4.695
Problem:    Out-of-bounds read, dectected by Coverity.
Solution:   Remember the value of cmap for the first matching encoding.  Reset
            cmap to that value if first matching encoding is going to be used.
            (Eliseo Martínez)
---

diff --git a/src/hardcopy.c b/src/hardcopy.c
index 95a367d49..b2e400f90 100644
--- a/src/hardcopy.c
+++ b/src/hardcopy.c
@@ -2513,13 +2513,18 @@ mch_print_init(psettings, jobname, forceit)
     props = enc_canon_props(p_encoding);
     if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE)))
     {
+	int cmap_first;
+
 	p_mbenc_first = NULL;
 	for (cmap = 0; cmap < (int)NUM_ELEMENTS(prt_ps_mbfonts); cmap++)
 	    if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap],
 								    &p_mbenc))
 	    {
 		if (p_mbenc_first == NULL)
+		{
 		    p_mbenc_first = p_mbenc;
+		    cmap_first = cmap;
+		}
 		if (prt_match_charset((char *)p_pmcs, &prt_ps_mbfonts[cmap],
 								   &p_mbchar))
 		    break;
@@ -2527,7 +2532,10 @@ mch_print_init(psettings, jobname, forceit)
 
 	/* Use first encoding matched if no charset matched */
 	if (p_mbchar == NULL && p_mbenc_first != NULL)
+	{
 	    p_mbenc = p_mbenc_first;
+	    cmap = cmap_first;
+	}
     }
 
     prt_out_mbyte = (p_mbenc != NULL);
diff --git a/src/version.c b/src/version.c
index 5601c0144..4cbf4b6ae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    695,
 /**/
     694,
 /**/