HCoop
/
hcoop
/
debian
/
exim4.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import Debian changes 4.89-2+deb9u4
[hcoop/debian/exim4.git]
/
src
/
exim_dbmbuild.c
diff --git
a/src/exim_dbmbuild.c
b/src/exim_dbmbuild.c
index
ce06f16
..
85ae901
100644
(file)
--- a/
src/exim_dbmbuild.c
+++ b/
src/exim_dbmbuild.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
09
*/
+/* Copyright (c) University of Cambridge 1995 - 20
15
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-88,10
+88,10
@@
Returns: the value of the character escape
*/
int
*/
int
-string_interpret_escape(uschar **pp)
+string_interpret_escape(
const
uschar **pp)
{
int ch;
{
int ch;
-uschar *p = *pp;
+
const
uschar *p = *pp;
ch = *(++p);
if (isdigit(ch) && ch != '8' && ch != '9')
{
ch = *(++p);
if (isdigit(ch) && ch != '8' && ch != '9')
{
@@
-329,7
+329,7
@@
while (Ufgets(line, max_insize, f) != NULL)
keystart = t;
while (*s != 0 && *s != '\"')
{
keystart = t;
while (*s != 0 && *s != '\"')
{
- if (*s == '\\') *t++ = string_interpret_escape(&s);
+ if (*s == '\\') *t++ = string_interpret_escape(
(const uschar **)
&s);
else *t++ = *s;
s++;
}
else *t++ = *s;
s++;
}
@@
-478,9
+478,11
@@
if (yield == 0 || yield == 1)
else
{
printf("dbmbuild abandoned\n");
else
{
printf("dbmbuild abandoned\n");
- #if defined(USE_DB) || defined(USE_TDB) || defined(USE_GDBM)
+#if defined(USE_DB) || defined(USE_TDB) || defined(USE_GDBM)
+ /* We created it, so safe to delete despite the name coming from outside */
+ /* coverity[tainted_string] */
Uunlink(temp_dbmname);
Uunlink(temp_dbmname);
-
#else
+#else
if (is_db)
{
sprintf(CS real_dbmname, "%s.db", temp_dbmname);
if (is_db)
{
sprintf(CS real_dbmname, "%s.db", temp_dbmname);
@@
-493,7
+495,7
@@
else
sprintf(CS real_dbmname, "%s.pag", temp_dbmname);
Uunlink(real_dbmname);
}
sprintf(CS real_dbmname, "%s.pag", temp_dbmname);
Uunlink(real_dbmname);
}
-
#endif /* USE_DB || USE_TDB */
+#endif /* USE_DB || USE_TDB */
}
return yield;
}
return yield;