Ticket #2652: man-db-2.5.7-fix_man_assertion-1.patch

lib/pipeline.c

@@ -329 +329 @@
         return cmd;
 }
 
+static void passthrough (void *data ATTRIBUTE_UNUSED)
+{
+        for (;;) {
+                char buffer[4096];
+                int r = read (STDIN_FILENO, buffer, 4096);
+                if (r <= 0)
+                        break;
+                if (fwrite (buffer, 1, (size_t) r, stdout) < (size_t) r)
+                        break;
+        }
+
+        return;
+}
+
+command *command_new_passthrough (void)
+{
+        return command_new_function ("cat", &passthrough, NULL, NULL);
+}
+
 command *command_dup (command *cmd)
 {
         command *newcmd = XMALLOC (command);
@@ -831 +850 @@
         return p;
 }
 
-static void passthrough (void *data ATTRIBUTE_UNUSED)
-{
-        for (;;) {
-                char buffer[4096];
-                int r = read (STDIN_FILENO, buffer, 4096);
-                if (r <= 0)
-                        break;
-                if (fwrite (buffer, 1, (size_t) r, stdout) < (size_t) r)
-                        break;
-        }
-
-        return;
-}
-
 void pipeline_connect (pipeline *source, pipeline *sink, ...)
 {
         va_list argv;
@@ -876 +881 @@
                  * because it has nowhere to send output. Until this is
                  * fixed, this kludge is necessary.
                  */
-                if (arg->ncommands == 0) {
-                        command *cmd = command_new_function
-                                ("cat", &passthrough, NULL, NULL);
-                        pipeline_command (arg, cmd);
-                }
+                if (arg->ncommands == 0)
+                        pipeline_command (arg, command_new_passthrough ());
         }
         va_end (argv);
 }

lib/pipeline.h

@@ -172 +172 @@
  */
 command *command_new_sequence (const char *name, ...) ATTRIBUTE_SENTINEL;
 
+/* Return a new command that just passes data from its input to its output. */
+command *command_new_passthrough (void);
+
 /* Return a duplicate of a command. */
 command *command_dup (command *cmd);
 

man-db-2.5.7

@@ +1 @@
+man-db 2.5.8
+============
+
+Major changes since man-db 2.5.7:
+
+        Fixes:
+        ------
+
+        o Fix assertion failure on 'man -l' with an uncompressed page and
+          any of --no-hyphenation, --no-justification, or a non-English
+          page.
+
 man-db 2.5.7 (16 February 2010)
 ===============================
 

man-db-2.5.7

@@ -2390 +2390 @@
 #endif /* TROFF_IS_GROFF */
 
                 if (seq->u.sequence.ncommands) {
-                        assert (decomp->ncommands == 1);
-                        command_sequence_command (seq, decomp->commands[0]);
-                        decomp->commands[0] = seq;
+                        assert (decomp->ncommands <= 1);
+                        if (decomp->ncommands) {
+                                command_sequence_command
+                                        (seq, decomp->commands[0]);
+                                decomp->commands[0] = seq;
+                        } else {
+                                command_sequence_command
+                                        (seq, command_new_passthrough ());
+                                pipeline_command (decomp, seq);
+                        }
                 } else
                         command_free (seq);
         }