[git] GPGME - branch, master, updated. gpgme-1.12.0-12-gd63d6d8

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  d63d6d8b8030ec1dc19f9f66c8af3b2f3288d309 (commit)
      from  233d2f3d351c5d3109740e79762ebd723b0d82fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d63d6d8b8030ec1dc19f9f66c8af3b2f3288d309
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Oct 16 17:05:14 2018 +0200

    core: Really remove CR from version output.
    
    * src/version.c (_gpgme_get_program_version): Fix test.
    --
    
    Fixes-commit: 6bde056355796f15b6e6954372e87f349847515b
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/version.c b/src/version.c
index 99698fa..bd1d965 100644
--- a/src/version.c
+++ b/src/version.c
@@ -338,7 +338,7 @@ _gpgme_get_program_version (const char *const file_name)
 	  mark = strchr (&line[linelen], '\n');
 	  if (mark)
 	    {
-	      if (mark > &line[0] && *mark == '\r')
+	      if (mark > &line[0] && mark[-1] == '\r')
 		mark--;
 	      *mark = '\0';
 	      break;

-----------------------------------------------------------------------

Summary of changes:
 src/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org