diff options
author | Russell Bryant <russell@russellbryant.com> | 2012-03-24 02:42:42 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2012-03-24 02:42:42 +0000 |
commit | cad07b3800b7212c363e2753d6d7540b585c3449 (patch) | |
tree | 80c307b11a35f91200f8b091d0f7e44715942339 /main/ast_expr2.h | |
parent | 721f92058f53b87a70872ec87dd1a35866280eee (diff) |
Multiple revisions 360356-360357
........
r360356 | russell | 2012-03-23 22:33:36 -0400 (Fri, 23 Mar 2012) | 6 lines
expression parser: Fix (theoretical) memory leak.
Fix a memory leak that is very unlikely to actually happen. If a malloc()
succeeded, but the following strdup() failed, the memory from the original
malloc() would be leaked.
........
r360357 | russell | 2012-03-23 22:34:39 -0400 (Fri, 23 Mar 2012) | 6 lines
Rebuild parsers.
This is needed to include the last fix to main/ast_expr2.y. The changes look
much bigger as this regeneration of the code was done with newer versions of
flex and bison.
........
Merged revisions 360356-360357 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 360358 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/ast_expr2.h')
-rw-r--r-- | main/ast_expr2.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/main/ast_expr2.h b/main/ast_expr2.h index 1fefe11f7..ddbab07dc 100644 --- a/main/ast_expr2.h +++ b/main/ast_expr2.h @@ -1,10 +1,8 @@ +/* A Bison parser, made by GNU Bison 2.5. */ -/* A Bison parser, made by GNU Bison 2.4.1. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C +/* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -71,7 +69,7 @@ typedef union YYSTYPE { -/* Line 1676 of yacc.c */ +/* Line 2068 of yacc.c */ #line 345 "ast_expr2.y" struct val *val; @@ -79,8 +77,8 @@ typedef union YYSTYPE -/* Line 1676 of yacc.c */ -#line 84 "ast_expr2.h" +/* Line 2068 of yacc.c */ +#line 82 "ast_expr2.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ |