diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:48:23 +0200 |
| commit | aa10a08696cae93799fcddae3f0245ceee905e01 (patch) | |
| tree | 950730c362229584b5e60fc1fe309325b7ba66b1 /mesalib/src/mesa/program/program.c | |
| parent | af1e359cc622a0c53d5632fb03ef9bd4c17de897 (diff) | |
| download | vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.gz vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.tar.bz2 vcxsrv-aa10a08696cae93799fcddae3f0245ceee905e01.zip | |
xserver mesa git update 6 sep 2012
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); |