Hi

Attached the patch for the version I intend to upload. Please respond if
you don't want this NMU to happen, if you are working yourself on a
patch or if you think that the attached patch won't work.

Cheers

Luk

-- 
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint:   D5AF 25FB 316B 53BB 08E7   F999 E544 DE07 9B7C 328D
diff -u clara-20031214/debian/changelog clara-20031214/debian/changelog
--- clara-20031214/debian/changelog
+++ clara-20031214/debian/changelog
@@ -1,3 +1,11 @@
+clara (20031214-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix segmentation fault on powerpc (Closes: #307103).
+  * Split xlibs-dev build-deps.
+
+ -- Luk Claes <[EMAIL PROTECTED]>  Thu,  5 Jan 2006 18:59:37 +0100
+
 clara (20031214-1) unstable; urgency=low
 
   * New upstream release (closes: #261492)
diff -u clara-20031214/debian/control clara-20031214/debian/control
--- clara-20031214/debian/control
+++ clara-20031214/debian/control
@@ -2,7 +2,7 @@
 Section: graphics
 Priority: extra
 Maintainer: Eduardo Marcel Macan <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), xlibs-dev
+Build-Depends: debhelper (>= 4.0.0), libx11-dev
 Standards-Version: 3.6.2
 
 Package: clara
only in patch2:
unchanged:
--- clara-20031214.orig/clara.c
+++ clara-20031214/clara.c
@@ -751,11 +751,12 @@
     s[128] = 0;
     logmsg(s);
 
-    if (!trace)
-        return;
-    va_start(args,m);
-    vfprintf(stderr,m,args);
-    fprintf(stderr,"\n");
+    if (trace) {
+        vfprintf(stderr,m,args);
+        fprintf(stderr,"\n");
+    }
+
+    va_end(args);
 }
 
 /*
@@ -775,10 +776,12 @@
     logmsg(s);
 
     /* send to stderr if requested */
-    if (!debug)
-        return;
-    vfprintf(stderr,m,args);
-    fprintf(stderr,"\n");
+    if (debug) {
+        vfprintf(stderr,m,args);
+        fprintf(stderr,"\n");
+    }
+
+    va_end(args);
 }
 
 /*
@@ -797,9 +800,10 @@
     s[128] = 0;
     logmsg(s);
 
-    va_start(args,m);
     vfprintf(stderr,m,args);
     fprintf(stderr,"\n");
+
+    va_end(args);
 }
 
 /* (devel)
only in patch2:
unchanged:
--- clara-20031214.orig/event.c
+++ clara-20031214/event.c
@@ -638,6 +638,8 @@
         }
     }
 
+    va_end(args);
+
 /*
     printf("request (priority %d, mclip=%d, redraw=%d) to draw the message 
\"%s\"\n",f,mclip,redraw_stline,s);
 */
only in patch2:
unchanged:
--- clara-20031214.orig/html.c
+++ clara-20031214/html.c
@@ -1548,11 +1548,12 @@
     va_list args;
     int n=0,f;
 
-    va_start(args, fmt);
     for (f=0; f==0; ) {
 
         /* try to write */
+        va_start(args, fmt);
         n = vsnprintf(*t+*top+1,*sz-*top-1,fmt,args);
+        va_end(args);
 
         /*
             Some implementations of vsnprintf return -1 when
@@ -1589,11 +1590,12 @@
     va_list args;
     int n=0,f;
 
-    va_start(args, fmt);
     for (f=0; f==0; ) {
 
         /* try to write */
+        va_start(args, fmt);
         n = vsnprintf(text+topt+1,textsz-topt-1,fmt,args);
+        va_end(args);
 
         /*
             Some implementations of vsnprintf return -1 when

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to