Andreas Tille pushed to branch master at Debian Med / samtools-legacy


Commits:
b14a4b2f by Andreas Tille at 2021-10-06T13:43:56+02:00
Better patch by John Marshall for "format not a string"

- - - - -


2 changed files:

- debian/changelog
- debian/patches/gcc-11.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+samtools-legacy (0.1.19+dfsg-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Better patch by John Marshall for "format not a string"
+
+ -- Andreas Tille <[email protected]>  Wed, 06 Oct 2021 13:43:16 +0200
+
 samtools-legacy (0.1.19+dfsg-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/gcc-11.patch
=====================================
@@ -1,16 +1,27 @@
-Author: Andreas Tille <[email protected]>
+Author: Andreas Tille <[email protected]>,
+        John Marshall <[email protected]>
 Last-Update: Fri, 01 Oct 2021 16:44:45 +0200
+Origin: https://github.com/samtools/samtools/pull/1509
 Description: Fix
   bam_tview_curses.c:66:2: error: format not a string literal and no format 
arguments [-Werror=format-security]
 
 --- a/bam_tview_curses.c
 +++ b/bam_tview_curses.c
-@@ -63,7 +63,7 @@ static void curses_mvprintw(struct Abstr
+@@ -56,15 +56,11 @@ static void curses_destroy(tview_t* base
+ 
+ static void curses_mvprintw(struct AbstractTview* tv,int y ,int x,const char* 
fmt,...)
+       {
+-      unsigned int size=tv->mcol+2;
+-      char* str=malloc(size);
+-      if(str==0) exit(EXIT_FAILURE);
+       va_list argptr;
        va_start(argptr, fmt);
-       vsnprintf(str,size, fmt, argptr);
+-      vsnprintf(str,size, fmt, argptr);
++      if (wmove(stdscr, y, x) != ERR)
++            vw_printw(stdscr, fmt, argptr);
        va_end(argptr);
 -      mvprintw(y,x,str);
-+      mvprintw(y,x,"%s",str);
-       free(str);
+-      free(str);
        }
  
+ static void curses_mvaddch(struct AbstractTview* tv,int y,int x,int ch)



View it on GitLab: 
https://salsa.debian.org/med-team/samtools-legacy/-/commit/b14a4b2fccb9ccd967b78fec2e7d640c3bc3c69b

-- 
View it on GitLab: 
https://salsa.debian.org/med-team/samtools-legacy/-/commit/b14a4b2fccb9ccd967b78fec2e7d640c3bc3c69b
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit

Reply via email to