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
62
63
64
65
66
|
Index: popt-1.16/popt.c
===================================================================
--- popt-1.16.orig/popt.c 2010-05-13 04:57:46.853009777 +0100
+++ popt-1.16/popt.c 2010-05-13 04:57:52.006009545 +0100
@@ -184,6 +184,7 @@
con->os->next = 1; /* skip argv[0] */
con->leftovers = calloc( (size_t)(argc + 1), sizeof(*con->leftovers) );
+ con->allocLeftovers = argc + 1;
/*@-dependenttrans -assignexpose@*/ /* FIX: W2DO? */
con->options = options;
/*@=dependenttrans =assignexpose@*/
@@ -1358,7 +1359,19 @@
return 0;
}
if (con->leftovers != NULL) /* XXX can't happen */
- con->leftovers[con->numLeftovers++] = origOptString;
+ /* One might think we can never overflow the leftovers
+ array. Actually, that's true, as long as you don't
+ use poptStuffArgs()... */
+ if ((con->numLeftovers + 1) >= (con->allocLeftovers)) {
+ con->allocLeftovers += 10;
+ con->leftovers =
+ realloc(con->leftovers,
+ sizeof(*con->leftovers) * con->allocLeftovers);
+ }
+ con->leftovers[con->numLeftovers++]
+ = xstrdup(origOptString); /* so a free of a stuffed
+ argv doesn't give us a
+ dangling pointer */
continue;
}
@@ -1612,6 +1625,8 @@
poptContext poptFreeContext(poptContext con)
{
+ int i;
+
if (con == NULL) return con;
poptResetContext(con);
con->os->argb = _free(con->os->argb);
@@ -1622,7 +1637,11 @@
con->execs = poptFreeItems(con->execs, con->numExecs);
con->numExecs = 0;
+ for (i = 0; i < con->numLeftovers; i++) {
+ con->leftovers[i] = _free(&con->leftovers[i]);
+ }
con->leftovers = _free(con->leftovers);
+
con->finalArgv = _free(con->finalArgv);
con->appName = _free(con->appName);
con->otherHelp = _free(con->otherHelp);
Index: popt-1.16/poptint.h
===================================================================
--- popt-1.16.orig/poptint.h 2010-05-13 04:57:46.878010140 +0100
+++ popt-1.16/poptint.h 2010-05-13 04:57:52.008009414 +0100
@@ -119,6 +119,7 @@
/*@owned@*/ /*@null@*/
poptArgv leftovers;
int numLeftovers;
+ int allocLeftovers;
int nextLeftover;
/*@keep@*/
const struct poptOption * options;
|