[med-svn] [Git][med-team/gmap][master] 3 commits: New upstream version 2021-05-27+ds

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / gmap


Commits:
28407ea7 by Nilesh Patra at 2021-05-30T23:20:01+05:30
New upstream version 2021-05-27+ds
- - - - -
45236662 by Nilesh Patra at 2021-05-30T23:20:14+05:30
Update upstream source from tag 'upstream/2021-05-27+ds'

Update to upstream version '2021-05-27+ds'
with Debian dir d6bf168a1ec3dc4b39a77466d20569d9bc6d8e01
- - - - -
c96a97dc by Nilesh Patra at 2021-05-30T23:21:25+05:30
Interim changelog entry

- - - - -


4 changed files:

- ChangeLog
- VERSION
- debian/changelog
- src/printbuffer.c


Changes:

=====================================
ChangeLog
=====================================
@@ -1,3 +1,12 @@
+2021-05-27  twu
+
+    * index.html: Revised for latest version
+
+    * VERSION: Updated version number
+
+    * printbuffer.c: Checking for line being NULL, which can happen with gff3
+      output
+
 2021-05-11  twu
 
     * trunk, VERSION, src, Makefile.gsnaptoo.am, cigar.c, concordance.c,


=====================================
VERSION
=====================================
@@ -1 +1 @@
-2021-05-08
\ No newline at end of file
+2021-05-27
\ No newline at end of file


=====================================
debian/changelog
=====================================
@@ -1,6 +1,6 @@
-gmap (2021-05-08+ds-1) UNRELEASED; urgency=medium
+gmap (2021-05-27+ds-1) UNRELEASED; urgency=medium
 
-  * New upstream version 2021-05-08+ds
+  * New upstream version 2021-05-27+ds
   * Remove merged patches d/p/{only-do-cpuid-on-amd64-i386.patch,cross}
   * Refresh d/p/{remove_getopt_code_copy.patch,install-data-local}
 


=====================================
src/printbuffer.c
=====================================
@@ -155,29 +155,33 @@ print_lines (FILE *fp_output, List_T *output_list, List_T *tail) {
   ptr = &(buffer[0]);
   for (l = *output_list; l != NULL; l = List_next(l)) {
     p = line = (char *) List_head(l);
-    linelength = strlen(line);
+    if (line == NULL) {
+      /* Possible with gff3 output */
+    } else {
+      linelength = strlen(line);
 
-    while (total_linelength + linelength >= OUTPUTLEN) {
-      allowed = OUTPUTLEN - total_linelength;
-      strncpy(ptr,p,allowed);
+      while (total_linelength + linelength >= OUTPUTLEN) {
+	allowed = OUTPUTLEN - total_linelength;
+	strncpy(ptr,p,allowed);
 #ifdef USE_WRITE
-      write(fileno(fp_output),buffer,OUTPUTLEN*sizeof(char));
+	write(fileno(fp_output),buffer,OUTPUTLEN*sizeof(char));
 #else
-      fwrite(buffer,sizeof(char),OUTPUTLEN,fp_output);
+	fwrite(buffer,sizeof(char),OUTPUTLEN,fp_output);
 #endif
 
-      ptr = &(buffer[0]);
-      total_linelength = 0;
+	ptr = &(buffer[0]);
+	total_linelength = 0;
 
-      p += allowed;
-      linelength -= allowed;
-    }
+	p += allowed;
+	linelength -= allowed;
+      }
       
-    strcpy(ptr,p);
-    ptr += linelength;
-    total_linelength += linelength;
+      strcpy(ptr,p);
+      ptr += linelength;
+      total_linelength += linelength;
 
-    FREE_OUT(line);
+      FREE_OUT(line);
+    }
   }
 
   if (total_linelength > 0) {
@@ -209,16 +213,24 @@ print_lines (FILE *fp_output, List_T *output_list, List_T *tail) {
 
   total_linelength = 0;
   for (l = *output_list; l != NULL; l = List_next(l)) {
-    p = line = (char *) List_head(l);
-    total_linelength += strlen(line);
+    line = (char *) List_head(l);
+    if (line == NULL) {
+      /* Possible with gff3 output */
+    } else {
+      total_linelength += strlen(line);
+    }
   }
 
   ptr = buffer = MALLOC_OUT((total_linelength+1)*sizeof(char));
   for (l = *output_list; l != NULL; l = List_next(l)) {
     line = (char *) List_head(l);
-    strcpy(ptr,line);
-    ptr += strlen(line);
-    FREE_OUT(line);
+    if (line == NULL) {
+      /* Possible with gff3 output */
+    } else {
+      strcpy(ptr,line);
+      ptr += strlen(line);
+      FREE_OUT(line);
+    }
   }
   
 #ifdef USE_WRITE



View it on GitLab: https://salsa.debian.org/med-team/gmap/-/compare/0220c3d49b20829e6a4afc23a256f2c6838505de...c96a97dcdbd26ca26b6fb809043cecc54cb1c489

-- 
View it on GitLab: https://salsa.debian.org/med-team/gmap/-/compare/0220c3d49b20829e6a4afc23a256f2c6838505de...c96a97dcdbd26ca26b6fb809043cecc54cb1c489
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210530/733ce449/attachment-0001.htm>