diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
| commit | ccc8a492607df715b08d27c6bb3b9d13b1ff48a2 (patch) | |
| tree | 4311d252acd49786ceed60cb55343af0a9294a2f /mesalib/src/mesa/program/program.c | |
| parent | a4d007b9b60f2fc7c8de46533e2f47ecb24f3c9c (diff) | |
| parent | aa10a08696cae93799fcddae3f0245ceee905e01 (diff) | |
| download | vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.gz vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.bz2 vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/program/program.c')
| -rw-r--r-- | mesalib/src/mesa/program/program.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c index 15337f4d8..becb77c1d 100644 --- a/mesalib/src/mesa/program/program.c +++ b/mesalib/src/mesa/program/program.c @@ -249,7 +249,7 @@ _mesa_find_line_column(const GLubyte *string, const GLubyte *pos, while (*p != 0 && *p != '\n') p++; len = p - lineStart; - s = (GLubyte *) malloc(len + 1); + s = malloc(len + 1); memcpy(s, lineStart, len); s[len] = 0; @@ -382,8 +382,7 @@ _mesa_delete_program(struct gl_context *ctx, struct gl_program *prog) if (prog == &_mesa_DummyProgram) return; - if (prog->String) - free(prog->String); + free(prog->String); if (prog->Instructions) { _mesa_free_instructions(prog->Instructions, prog->NumInstructions); |