pool/gettext-runtime
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1249829 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1249829
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gettext-runtime?expand=0&rev=98
This commit is contained in:
Ana Guerrero 2025-03-04 17:31:35 +00:00 committed by Git OBS Bridge
commit 62affc6d77
9 changed files with 139 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
0003-Fix-malformed-header-processing.patch Normal file
View File

@ -0,0 +1,98 @@
From 88d67f8eacdd301d836a6902374dc10e8cc05d57 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Wed, 26 Feb 2025 03:00:18 +0100
Subject: [PATCH 3/3] Fix malformed header processing
---
gettext-tools/src/msgl-header.c | 68 ++++++++++++++++++++++++---------
1 file changed, 51 insertions(+), 17 deletions(-)
diff --git a/gettext-tools/src/msgl-header.c b/gettext-tools/src/msgl-header.c
index 6fe659e73..fb5186a89 100644
--- a/gettext-tools/src/msgl-header.c
+++ b/gettext-tools/src/msgl-header.c
@@ -397,30 +397,64 @@ message_list_header_list (message_list_ty *mlp)
{
/* We found the correct message. */
message_ty *mp = mlp->item[j];
+
+ /* Test whether the field occurs in the header entry. */
const char *h = mp->msgstr;
+
message_list_ty * header = message_list_alloc (false);
int ctr = 0;
while (*h != '\0')
- {
- char *enh = strchr (h, ':');
- enh++;
- char * msgid = (char *)XNMALLOC (((enh - h) + 1), char);
- memcpy (msgid, h, enh - h);
- /* Make the string null-terminated. */
- (msgid)[enh-h] = '\0';
- h = enh + 1;
-
- enh = strchr (h, '\n');
- if (enh != NULL)
+ {
+ const char *enh;
+ const char *enhz;
+ const char *sep;
+ const char *value;
+
+ enh = strchr (h, '\n');
+ if (enh)
+ {
+ enhz = enh;
+ enh++;
+ }
+ else
+ {
+ /* Missing trailing EOL. */
+ enh = h + strlen(h);
+ enhz = enh;
+ }
+
+ sep = strchr (h, ':');
+ if (sep == NULL || sep >= enhz)
+ {
+ /* Line does not contain ':'. */
+ sep = enhz;
+ value = enhz;
+ }
+ else
+ {
+ sep++;
+ if (*sep != ' ')
+ /* ' ' missing after ':'. */
+ value = sep;
+ else
+ value = sep + 1;
+ }
+
+ char * msgid = (char *)XNMALLOC (((sep - h) + 1), char);
+ memcpy (msgid, h, sep - h);
+ /* Make the string null-terminated. */
+ msgid[sep-h] = '\0';
+ char * msgstr = (char *)XNMALLOC (((enhz - value) + 1), char);
+ memcpy (msgstr, value, enhz - value);
+ /* Make the string null-terminated. */
+ msgstr[enhz-value] = '\0';
+
+ if (h != NULL)
{
- char * msgstr = (char *)XNMALLOC (((enh - h) + 1), char);
- memcpy (msgstr, h, enh - h);
- /* Make the string null-terminated. */
- msgstr[enh-h] = '\0';
lex_pos_ty pos = {NULL, ctr++};
- message_list_append (header, message_alloc (NULL, msgid, NULL, msgstr, enh - h, &pos));
- h = enh + 1;
+ message_list_append (header, message_alloc (NULL, msgid, NULL, msgstr, enhz - value, &pos));
+ h = enh;
}
else return NULL;
}
--
2.48.1

7
gettext-csharp.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Feb 26 03:01:34 CET 2025 - Stanislav Brabec <sbrabec@suse.com>
- Fix crash while handling po files with malformed header and
process them properly
(0003-Fix-malformed-header-processing.patch, boo#1227316).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 16 08:42:20 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com> Tue Jul 16 08:42:20 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>

4
gettext-csharp.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gettext-csharp # spec file for package gettext-csharp
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -47,6 +47,8 @@ Patch13: reproducible.patch
# PATCH-FEATURE bsc#1165138 # PATCH-FEATURE bsc#1165138
Patch14: 0001-msgcat-Add-feature-to-use-the-newest-po-file.patch Patch14: 0001-msgcat-Add-feature-to-use-the-newest-po-file.patch
Patch15: 0002-msgcat-Merge-headers-when-use-first.patch Patch15: 0002-msgcat-Merge-headers-when-use-first.patch
# PATCH-FEATURE-FIX-SUSE boo#1227316 -- sbrabec@suse.com
Patch16: 0003-Fix-malformed-header-processing.patch
BuildRequires: automake >= 1.14 BuildRequires: automake >= 1.14
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++

7
gettext-java.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Feb 26 03:01:34 CET 2025 - Stanislav Brabec <sbrabec@suse.com>
- Fix crash while handling po files with malformed header and
process them properly
(0003-Fix-malformed-header-processing.patch, boo#1227316).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 16 08:42:20 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com> Tue Jul 16 08:42:20 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>

4
gettext-java.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gettext-java # spec file for package gettext-java
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -46,6 +46,8 @@ Patch14: 0001-msgcat-Add-feature-to-use-the-newest-po-file.patch
Patch15: 0002-msgcat-Merge-headers-when-use-first.patch Patch15: 0002-msgcat-Merge-headers-when-use-first.patch
# PATCH-FIX-UPSTREAM https://lists.gnu.org/archive/html/bug-gettext/2024-07/msg00021.html # PATCH-FIX-UPSTREAM https://lists.gnu.org/archive/html/bug-gettext/2024-07/msg00021.html
Patch16: reproducible-jar.patch Patch16: reproducible-jar.patch
# PATCH-FEATURE-FIX-SUSE boo#1227316 -- sbrabec@suse.com
Patch17: 0003-Fix-malformed-header-processing.patch
BuildRequires: automake >= 1.14 BuildRequires: automake >= 1.14
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++

9
gettext-runtime-mini.changes
View File

@ -1,5 +1,12 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 12 10:43:43 UTC 2024 - Dan Čermák <dcermak@suse.com> Wed Feb 26 03:01:34 CET 2025 - Stanislav Brabec <sbrabec@suse.com>
- Fix crash while handling po files with malformed header and
process them properly
(0003-Fix-malformed-header-processing.patch, boo#1227316).
-------------------------------------------------------------------
Thu Sep 12 10:43:39 UTC 2024 - Dan Čermák <dcermak@suse.com>
- Move envsubst requires into main package, gettext.sh is not part of - Move envsubst requires into main package, gettext.sh is not part of
gettext-tools, but gettext-runtime (fixes boo#1227070) gettext-tools, but gettext-runtime (fixes boo#1227070)

4
gettext-runtime-mini.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gettext-runtime-mini # spec file for package gettext-runtime-mini
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -79,6 +79,8 @@ Patch13: reproducible.patch
# PATCH-FEATURE bsc#1165138 # PATCH-FEATURE bsc#1165138
Patch14: 0001-msgcat-Add-feature-to-use-the-newest-po-file.patch Patch14: 0001-msgcat-Add-feature-to-use-the-newest-po-file.patch
Patch15: 0002-msgcat-Merge-headers-when-use-first.patch Patch15: 0002-msgcat-Merge-headers-when-use-first.patch
# PATCH-FEATURE-FIX-SUSE boo#1227316 -- sbrabec@suse.com
Patch16: 0003-Fix-malformed-header-processing.patch
%description %description
This package contains the intl library as well as tools that ease the This package contains the intl library as well as tools that ease the

7
gettext-runtime.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Feb 26 03:01:34 CET 2025 - Stanislav Brabec <sbrabec@suse.com>
- Fix crash while handling po files with malformed header and
process them properly
(0003-Fix-malformed-header-processing.patch, boo#1227316).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 12 10:43:39 UTC 2024 - Dan Čermák <dcermak@suse.com> Thu Sep 12 10:43:39 UTC 2024 - Dan Čermák <dcermak@suse.com>

4
gettext-runtime.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gettext-runtime # spec file for package gettext-runtime
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -79,6 +79,8 @@ Patch13: reproducible.patch
# PATCH-FEATURE bsc#1165138 # PATCH-FEATURE bsc#1165138
Patch14: 0001-msgcat-Add-feature-to-use-the-newest-po-file.patch Patch14: 0001-msgcat-Add-feature-to-use-the-newest-po-file.patch
Patch15: 0002-msgcat-Merge-headers-when-use-first.patch Patch15: 0002-msgcat-Merge-headers-when-use-first.patch
# PATCH-FEATURE-FIX-SUSE boo#1227316 -- sbrabec@suse.com
Patch16: 0003-Fix-malformed-header-processing.patch
%description %description
This package contains the intl library as well as tools that ease the This package contains the intl library as well as tools that ease the