summaryrefslogtreecommitdiff
path: root/debian/patches/05_fix_string_format.patch
blob: d902ff79bc887a16ce309ce262b40327fff15722 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
Description: Fix sprintf() format strings
 In several snprintf() calls, no appropriate format arguments were given. This
 patch adds them.
Author: Roland Stigge <stigge@antcom.de>

--- xcircuit-3.8.78.dfsg.orig/svg.c
+++ xcircuit-3.8.78.dfsg/svg.c
@@ -1109,12 +1109,12 @@ int xctcl_svg(ClientData clientData, Tcl
 
    if (locobjc >= 2) {
       /* If there is a non-option argument, use it for the output filename */
-      sprintf(filename, Tcl_GetString(objv[1]));
+      sprintf(filename, "%s", Tcl_GetString(objv[1]));
    }
    else if (xobjs.pagelist[areawin->page]->pageinst->thisobject->name == NULL)
-      sprintf(filename, xobjs.pagelist[areawin->page]->filename);
+      sprintf(filename, "%s", xobjs.pagelist[areawin->page]->filename);
    else
-      sprintf(filename, xobjs.pagelist[areawin->page]->pageinst->thisobject->name);
+      sprintf(filename, "%s", xobjs.pagelist[areawin->page]->pageinst->thisobject->name);
 
    pptr = strrchr(filename, '.');
    if (pptr != NULL)
--- xcircuit-3.8.78.dfsg.orig/tclxcircuit.c
+++ xcircuit-3.8.78.dfsg/tclxcircuit.c
@@ -3857,7 +3857,7 @@ int xctcl_object(ClientData clientData,
       case NameIdx:
 	 if (nidx == 1 || areawin->selects == 0) {
 	    if (objc == 3) {
-	       sprintf(thisinst->thisobject->name, Tcl_GetString(objv[nidx + 2]));
+	       sprintf(thisinst->thisobject->name, "%s", Tcl_GetString(objv[nidx + 2]));
 	       checkname(thisinst->thisobject);
 	    }
 	    Tcl_AppendElement(interp, thisinst->thisobject->name);
@@ -7267,7 +7267,7 @@ int xctcl_page(ClientData clientData, Tc
 
       case LoadIdx:
 	 TechReplaceSave();
-	 sprintf(_STR2, Tcl_GetString(objv[2 + nidx]));
+	 sprintf(_STR2, "%s", Tcl_GetString(objv[2 + nidx]));
 	 for (i = 3 + nidx; i < objc; i++) {
 	    argv = Tcl_GetString(objv[i]);
 	    if ((*argv == '-') && !strncmp(argv, "-repl", 5)) {
@@ -7353,7 +7353,7 @@ int xctcl_page(ClientData clientData, Tc
 
 	 switch (importtype) {
 	    case XCircuitIdx:
-	       sprintf(_STR2, Tcl_GetString(objv[3 + nidx]));
+	       sprintf(_STR2, "%s", Tcl_GetString(objv[3 + nidx]));
 	       for (i = 4; i < objc; i++) {
 		  strcat(_STR2, ",");
 		  strcat(_STR2, Tcl_GetString(objv[i + nidx]));
@@ -7370,7 +7370,7 @@ int xctcl_page(ClientData clientData, Tc
 		  Tcl_SetObjResult(interp, objPtr);
 		  return XcTagCallback(interp, objc, objv);
 	       }
-	       sprintf(_STR2, Tcl_GetString(objv[3 + nidx]));
+	       sprintf(_STR2, "%s", Tcl_GetString(objv[3 + nidx]));
 	       if (savepage != pageno) newpage(pageno);
 	       loadbackground();
 	       if (savepage != pageno) newpage(savepage);