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
67
68
|
Index: branches/SAMBA_3_0/source/lib/util.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util.c (revision 4119)
+++ branches/SAMBA_3_0/source/lib/util.c (revision 4120)
@@ -867,9 +867,7 @@
void *malloc_(size_t size)
{
#undef malloc
- /* If we don't add an amount here the glibc memset seems to write
- one byte over. */
- return malloc(size+16);
+ return malloc(size);
#define malloc(s) __ERROR_DONT_USE_MALLOC_DIRECTLY
}
@@ -880,9 +878,7 @@
static void *calloc_(size_t count, size_t size)
{
#undef calloc
- /* If we don't add an amount here the glibc memset seems to write
- one byte over. */
- return calloc(count+1, size);
+ return calloc(count, size);
#define calloc(n,s) __ERROR_DONT_USE_CALLOC_DIRECTLY
}
@@ -893,9 +889,7 @@
static void *realloc_(void *ptr, size_t size)
{
#undef realloc
- /* If we don't add an amount here the glibc memset seems to write
- one byte over. */
- return realloc(ptr, size+16);
+ return realloc(ptr, size);
#define realloc(p,s) __ERROR_DONT_USE_RELLOC_DIRECTLY
}
Index: branches/SAMBA_3_0/source/lib/bitmap.c
===================================================================
--- branches/SAMBA_3_0/source/lib/bitmap.c (revision 4119)
+++ branches/SAMBA_3_0/source/lib/bitmap.c (revision 4120)
@@ -41,7 +41,7 @@
return NULL;
}
- memset(bm->b, 0, sizeof(bm->b[0])*(n+31)/32);
+ memset(bm->b, 0, sizeof(uint32)*((n+31)/32));
return bm;
}
@@ -78,7 +78,7 @@
return NULL;
}
- memset(bm->b, 0, sizeof(bm->b[0])*(n+31)/32);
+ memset(bm->b, 0, sizeof(uint32)*((n+31)/32));
return bm;
}
@@ -92,7 +92,7 @@
int count = MIN(dst->n, src->n);
SMB_ASSERT(dst->b != src->b);
- memcpy(dst->b, src->b, sizeof(dst->b[0])*(count+31)/32);
+ memcpy(dst->b, src->b, sizeof(uint32)*((count+31)/32));
return count;
}
|
GitWeb
