D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-15 04:13:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix format-string bugs by adding __attribute__((__format__)) in all applicable

Browse Source 
places and fixing all warnings my gcc produced.
Among other things, this should fix several segfaults (including one I just
ran into).
This commit is contained in:
Frits van Bommel
2009-05-17 00:15:25 +02:00
parent 392a4a850e
commit 76ae0b0ab6
15 changed files with 56 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dmd/attrib.c
View File

@@ -983,7 +983,7 @@ void PragmaDeclaration::semantic(Scope *sc)
}
else
{
error("command '%s' invalid");
error("command '%s' invalid", expr->toChars());
fatal();
}
}

4
dmd/dsymbol.h
View File

@@ -122,8 +122,8 @@ struct Dsymbol : Object
char *locToChars();
int equals(Object *o);
int isAnonymous();
void error(Loc loc, const char *format, ...);
void error(const char *format, ...);
void error(Loc loc, const char *format, ...) IS_PRINTF(3);
void error(const char *format, ...) IS_PRINTF(2);
void checkDeprecated(Loc loc, Scope *sc);
Module *getModule(); // module where declared
Module *getCompilationModule(); // possibly different for templates

8
dmd/expression.c
View File

@@ -1466,7 +1466,7 @@ void IntegerExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
case Tdchar: // BUG: need to cast(dchar)
if ((uinteger_t)v > 0xFF)
{
buf->printf("'\\U%08x'", v);
buf->printf("'\\U%08x'", (unsigned)v);
break;
}
case Tchar:
@@ -2934,7 +2934,7 @@ void ArrayLiteralExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
void ArrayLiteralExp::toMangleBuffer(OutBuffer *buf)
{
size_t dim = elements ? elements->dim : 0;
buf->printf("A%u", dim);
buf->printf("A%zu", dim);
for (size_t i = 0; i < dim; i++)
{ Expression *e = (Expression *)elements->data[i];
e->toMangleBuffer(buf);
@@ -3068,7 +3068,7 @@ void AssocArrayLiteralExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
void AssocArrayLiteralExp::toMangleBuffer(OutBuffer *buf)
{
size_t dim = keys->dim;
buf->printf("A%u", dim);
buf->printf("A%zu", dim);
for (size_t i = 0; i < dim; i++)
{ Expression *key = (Expression *)keys->data[i];
Expression *value = (Expression *)values->data[i];
@@ -3284,7 +3284,7 @@ void StructLiteralExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
void StructLiteralExp::toMangleBuffer(OutBuffer *buf)
{
size_t dim = elements ? elements->dim : 0;
buf->printf("S%u", dim);
buf->printf("S%zu", dim);
for (size_t i = 0; i < dim; i++)
{ Expression *e = (Expression *)elements->data[i];
if (e)

4
dmd/expression.h
View File

@@ -98,8 +98,8 @@ struct Expression : Object
void print();
char *toChars();
virtual void dump(int indent);
void error(const char *format, ...);
void warning(const char *format, ...);
void error(const char *format, ...) IS_PRINTF(2);
void warning(const char *format, ...) IS_PRINTF(2);
virtual void rvalue();
static Expression *combine(Expression *e1, Expression *e2);

2
dmd/html.h
View File

@@ -27,7 +27,7 @@ struct Html
Html(const char *sourcename, unsigned char *base, unsigned length);
void error(const char *format, ...);
void error(const char *format, ...) IS_PRINTF(2);
void extractCode(OutBuffer *buf);
void skipTag();
void skipString();

4
dmd/lexer.h
View File

@@ -292,8 +292,8 @@ struct Lexer
unsigned wchar(unsigned u);
TOK number(Token *t);
TOK inreal(Token *t);
void error(const char *format, ...);
void error(Loc loc, const char *format, ...);
void error(const char *format, ...) IS_PRINTF(2);
void error(Loc loc, const char *format, ...) IS_PRINTF(3);
void pragma();
unsigned decodeUTF();
void getDocComment(Token *t, unsigned lineComment);

12
dmd/mars.h
View File

@@ -76,6 +76,14 @@ the target object file format:
#endif
#endif
#ifndef IS_PRINTF
# ifdef __GNUC__
# define IS_PRINTF(FMTARG) __attribute((__format__ (__printf__, (FMTARG), (FMTARG)+1) ))
# else
# define IS_PRINTF(FMTARG)
# endif
#endif
#ifdef IN_GCC
/* Changes for the GDC compiler by David Friedman */
#endif
@@ -395,9 +403,9 @@ enum MATCH
MATCHexact // exact match
};
void warning(Loc loc, const char *format, ...);
void warning(Loc loc, const char *format, ...) IS_PRINTF(2);
void vwarning(Loc loc, const char *format, va_list);
void error(Loc loc, const char *format, ...);
void error(Loc loc, const char *format, ...) IS_PRINTF(2);
void verror(Loc loc, const char *format, va_list);
void fatal();
void err_nomem();

4
dmd/mtype.h
View File

@@ -267,8 +267,8 @@ struct Type : Object
Type *next;
Type *nextOf() { return next; }
static void error(Loc loc, const char *format, ...);
static void warning(Loc loc, const char *format, ...);
static void error(Loc loc, const char *format, ...) IS_PRINTF(2);
static void warning(Loc loc, const char *format, ...) IS_PRINTF(2);
#if IN_DMD
// For backend

14
dmd/root/root.h
View File

@@ -18,6 +18,14 @@
#pragma once
#endif
#ifndef IS_PRINTF
# ifdef __GNUC__
# define IS_PRINTF(FMTARG) __attribute((__format__ (__printf__, (FMTARG), (FMTARG)+1) ))
# else
# define IS_PRINTF(FMTARG)
# endif
#endif
typedef size_t hash_t;
#include "dchar.h"
@@ -29,9 +37,9 @@ int wcharIsAscii(wchar_t *, unsigned len);
int bstrcmp(unsigned char *s1, unsigned char *s2);
char *bstr2str(unsigned char *b);
void error(const char *format, ...);
void error(const char *format, ...) IS_PRINTF(1);
void error(const wchar_t *format, ...);
void warning(const char *format, ...);
void warning(const char *format, ...) IS_PRINTF(1);
#ifndef TYPEDEFS
#define TYPEDEFS
@@ -291,7 +299,7 @@ struct OutBuffer : Object
void fill0(unsigned nbytes);
void align(unsigned size);
void vprintf(const char *format, va_list args);
void printf(const char *format, ...);
void printf(const char *format, ...) IS_PRINTF(2);
#if M_UNICODE
void vprintf(const unsigned short *format, va_list args);
void printf(const unsigned short *format, ...);

4
dmd/statement.h
View File

@@ -104,8 +104,8 @@ struct Statement : Object
void print();
char *toChars();
void error(const char *format, ...);
void warning(const char *format, ...);
void error(const char *format, ...) IS_PRINTF(2);
void warning(const char *format, ...) IS_PRINTF(2);
virtual void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
virtual TryCatchStatement *isTryCatchStatement() { return NULL; }
virtual GotoStatement *isGotoStatement() { return NULL; }

4
gen/arrays.cpp
View File

@@ -240,7 +240,7 @@ LLConstant* DtoConstArrayInitializer(ArrayInitializer* arrinit)
// make sure the number of initializers is sane
if (arrinit->index.dim > arrlen || arrinit->dim > arrlen)
{
error(arrinit->loc, "too many initializers, %d, for array[%d]", arrinit->index.dim, arrlen);
error(arrinit->loc, "too many initializers, %u, for array[%zu]", arrinit->index.dim, arrlen);
fatal();
}
@@ -273,7 +273,7 @@ LLConstant* DtoConstArrayInitializer(ArrayInitializer* arrinit)
// error check from dmd
if (initvals[j] != NULL)
{
error(arrinit->loc, "duplicate initialization for index %d", j);
error(arrinit->loc, "duplicate initialization for index %zu", j);
}
LLConstant* c = DtoConstInitializer(val->loc, elemty, val);

14
gen/logger.h
View File

@@ -3,6 +3,14 @@
#include "llvm/Support/Streams.h"
#ifndef IS_PRINTF
# ifdef __GNUC__
# define IS_PRINTF(FMTARG) __attribute((__format__ (__printf__, (FMTARG), (FMTARG)+1) ))
# else
# define IS_PRINTF(FMTARG)
# endif
#endif
struct Loc;
namespace Logger
@@ -10,13 +18,13 @@ namespace Logger
void indent();
void undent();
llvm::OStream cout();
void println(const char* fmt, ...);
void print(const char* fmt, ...);
void println(const char* fmt, ...) IS_PRINTF(1);
void print(const char* fmt, ...) IS_PRINTF(1);
void enable();
void disable();
bool enabled();
void attention(Loc loc, const char* fmt, ...);
void attention(Loc loc, const char* fmt, ...) IS_PRINTF(2);
struct LoggerScope
{

2
gen/main.cpp
View File

@@ -876,7 +876,7 @@ int main(int argc, char** argv)
delete stripMD;
if(linker.LinkInModule(llvmModules[i], &errormsg))
error(errormsg.c_str());
error("%s", errormsg.c_str());
delete llvmModules[i];
}

7
gen/toir.cpp
View File

@@ -313,7 +313,8 @@ DValue* RealExp::toElem(IRState* p)
LLConstant* RealExp::toConstElem(IRState* p)
{
Logger::print("RealExp::toConstElem: %s @ %s | %LX\n", toChars(), type->toChars(), value);
Logger::print("RealExp::toConstElem: %s @ %s | %LX\n", toChars(), type->toChars(),
0xFFFFFFFFFFUL & *(long long unsigned*)&value);
LOG_SCOPE;
Type* t = type->toBasetype();
return DtoConstFP(t, value);
@@ -2473,7 +2474,7 @@ DValue* StructLiteralExp::toElem(IRState* p)
IF_LOG Logger::println("expr: %p", expr);
if (expr)
{
IF_LOG Logger::println("expr = %s", it.index, expr->toChars());
IF_LOG Logger::println("expr %zu = %s", it.index, expr->toChars());
LLValue* v = DtoExprValue(vd->type, expr);
initvalues.push_back(v);
}
@@ -2606,7 +2607,7 @@ DValue* AssocArrayLiteralExp::toElem(IRState* p)
Expression* ekey = (Expression*)keys->data[i];
Expression* eval = (Expression*)values->data[i];
Logger::println("(%u) aa[%s] = %s", i, ekey->toChars(), eval->toChars());
Logger::println("(%zu) aa[%s] = %s", i, ekey->toChars(), eval->toChars());
// index
DValue* key = ekey->toElem(p);

2
ir/irdsymbol.cpp
View File

@@ -9,7 +9,7 @@ std::set<IrDsymbol*> IrDsymbol::list;
void IrDsymbol::resetAll()
{
Logger::println("resetting %u Dsymbols", list.size());
Logger::println("resetting %zu Dsymbols", list.size());
std::set<IrDsymbol*>::iterator it;
for(it = list.begin(); it != list.end(); ++it)
(*it)->reset();