groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 12/12: [libbib]: Fix bogus size diagnostic.


From: G. Branden Robinson
Subject: [groff] 12/12: [libbib]: Fix bogus size diagnostic.
Date: Fri, 10 Nov 2023 17:36:14 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit afd325aaebe7db8f15e3f5562f03f54d2b27e6b6
Author: Paul Eggert <eggert@cs.ucla.edu>
AuthorDate: Thu Nov 9 13:47:07 2023 -0800

    [libbib]: Fix bogus size diagnostic.
    
    * src/libs/libbib/index.cpp (index_search_item::check_header): Fix size
      calculation typo that generated bogus diagnostic "lookbib: error:
      corrupt header in index file".
    
    {Fixes <https://savannah.gnu.org/bugs/?64879>.  Problem introduced by me
    in commit 4fad0459bb, 2022-01-05.  -- GBR, 2023-11-10}
---
 ChangeLog                 | 12 ++++++++++++
 src/libs/libbib/index.cpp |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 05c0d528e..dc5437135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-11-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       [libbib]: Fix bogus size diagnostic.
+
+       * src/libs/libbib/index.cpp (index_search_item::check_header):
+       Fix size calculation typo that generated bogus diagnostic
+       "lookbib: error: corrupt header in index file".
+
+       {Fixes <https://savannah.gnu.org/bugs/?64879>.  Problem
+       introduced by me in commit 4fad0459bb, 2022-01-05.
+       -- GBR, 2023-11-10}
+
 2023-11-10  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/roff/troff/input.cpp (device_request, output_request):
diff --git a/src/libs/libbib/index.cpp b/src/libs/libbib/index.cpp
index 0664746ae..18701a157 100644
--- a/src/libs/libbib/index.cpp
+++ b/src/libs/libbib/index.cpp
@@ -163,7 +163,7 @@ const char *index_search_item::check_header(index_header 
*file_header,
               + file_header->lists_size * sizeof(int)
               + file_header->table_size * sizeof(int)
               + file_header->strings_size
-              + sizeof(file_header));
+              + sizeof *file_header);
   if (sz != file_size)
     return("size mismatch between header and data");
   unsigned size_remaining = file_size;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]