From 2bad4d89684303fe884410ab0ae53770df6a6093 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 22 Aug 2017 02:26:40 +0200
Subject: [PATCH] Avoid extraneous NUL bytes in .mo files.

Reported by Jakub Wilk <jwilk@jwilk.net> via Santiago Vila <sanvila@unex.es>
in <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872869>.

* gettext-tools/src/msgl-header.c (msgdomain_list_set_header_field,
message_list_delete_header_field): Adjust msgstr_len when modifying msgstr.
---
 gettext-tools/src/msgl-header.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gettext-tools/src/msgl-header.c b/gettext-tools/src/msgl-header.c
index 219b412ab..8e41d66d3 100644
--- a/gettext-tools/src/msgl-header.c
+++ b/gettext-tools/src/msgl-header.c
@@ -1,5 +1,5 @@
 /* Message list header manipulation.
-   Copyright (C) 2007, 2015-2016 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2015-2017 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
@@ -166,6 +166,7 @@ msgdomain_list_set_header_field (msgdomain_list_ty *mdlp,
               }
 
             mp->msgstr = new_header;
+            mp->msgstr_len = strlen (new_header) + 1;
           }
     }
 }
@@ -217,6 +218,7 @@ message_list_delete_header_field (message_list_ty *mlp,
               *p = '\0';
 
             mp->msgstr = new_header;
+            mp->msgstr_len = strlen (new_header) + 1;
           }
       }
 }
-- 
2.47.3