Commit graph

149 commits

Author SHA1 Message Date
Alexis La Goutte
d8001e8064 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\*\* \$Id\$/,+1 d') (2 star and space)

Change-Id: I48505ffb8bfa103cd7db0117e18cdb1925a7034d
Reviewed-on: https://code.wireshark.org/review/884
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:50:19 +00:00
Alexis La Goutte
7d77d753c6 Continue to remove $Id$ from top of file
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ )

Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9
Reviewed-on: https://code.wireshark.org/review/886
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:49:26 +00:00
Alexis La Goutte
757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Alexis La Goutte
09cd306d1c Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\* \$Id\$/,+1 d') (no space before star)

Change-Id: I318968db2b8512ba1303b5fc5c624c66441658f0
Reviewed-on: https://code.wireshark.org/review/879
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:30:52 +00:00
Alexis La Goutte
94a791a76e Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$)

Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688
Reviewed-on: https://code.wireshark.org/review/876
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31 16:00:04 +00:00
Jörg Mayer
a8002aa0b7 Fix two coverity messages:
*** CID 718534:  Dereference before null check  (REVERSE_INULL)
/tools/lemon/lemon.c: 3425 in translate_code()
3419                rp->rhs[i]->index,i-rp->nrhs+1);
3420           }else{
3421             /* No destructor defined for this term */
3422           }
3423         }
3424       }
>>>     CID 718534:  Dereference before null check  (REVERSE_INULL)
>>>     Null-checking "rp->code" suggests that it may be null, but it has already been
+dereferenced on all paths leading to the check.
3425       if( rp->code ){
3426         cp = append_str(0,0,0,0);
3427         rp->code = Strsafe(cp?cp:"");
3428       }
3429     }
3430

*** CID 1156989:  Out-of-bounds read  (OVERRUN)
/tools/lemon/lemon.c: 3139 in tplt_xfer()
3133       int i, iStart;
3134       char line[LINESIZE];
3135       while( fgets(line,LINESIZE,in) && (line[0]!='%' || line[1]!='%') ){
3136         (*lineno)++;
3137         iStart = 0;
3138         if( name ){
>>>     CID 1156989:  Out-of-bounds read  (OVERRUN)
>>>     Overrunning array "line" of 1000 bytes at byte offset 1000 using index "i"
+(which evaluates to 1000).
3139           for(i=0; line[i] && i<LINESIZE; i++){
3140             if( line[i]=='P' && i<(LINESIZE-5) && strncmp(&line[i],"Parse",5)==0
3141               && (i==0 || !safe_isalpha(line[i-1]))
3142             ){
3143               if( i>iStart ) fprintf(out,"%.*s",i-iStart,&line[iStart]);
3144               fprintf(out,"%s",name);

svn path=/trunk/; revision=54849
2014-01-19 17:59:20 +00:00
Guy Harris
61d5c458a0 Squelch some warnings.
svn path=/trunk/; revision=54711
2014-01-13 19:07:48 +00:00
Balint Reczey
2ec033d15e Fix potential signed int overflow in Lemon
This chrashed Solaris buildbot when -ftrapv was enabled.
Triaged by Guy Harris, see detail at:
http://www.wireshark.org/lists/wireshark-dev/201311/msg00185.html

svn path=/trunk/; revision=53624
2013-11-28 16:04:33 +00:00
Jeff Morriss
0690c4f490 More SVN properties cleanup.
svn path=/trunk/; revision=52884
2013-10-27 01:11:15 +00:00
Evan Huus
2322bd3122 Fix lemon FSF address and add license exception for the generated mate grammar
files. One of them has no license (it is just defines) and the other gets picked
up as LGPL for no reason I can discern.

svn path=/trunk/; revision=52675
2013-10-18 18:10:46 +00:00
Graham Bloice
9c4ee86784 Add CMake properties to targets so that they are logically organised when using a Visual Studio solution.
Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution.

svn path=/trunk/; revision=52580
2013-10-13 09:21:55 +00:00
Chris Maynard
fdead4df94 Fix Coverity CID 660 (Negative array index read) by holding off the assignment to yytos until after we check that pParser->yyidx is non-negative.
See also: http://cwe.mitre.org/data/definitions/129.html
#BACKPORT(1.10)

svn path=/trunk/; revision=50336
2013-07-03 02:28:26 +00:00
Chris Maynard
83b4b73dd1 Fix Coverity CID 280323 (Free of array-typed value) by ensuring that tpltname doesn't point to the buf[] stack array before attempting to free it.
#BACKPORT(1.10)

svn path=/trunk/; revision=50335
2013-07-03 01:47:18 +00:00
Chris Maynard
ce088c334d makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.
svn path=/trunk/; revision=50140
2013-06-25 15:32:49 +00:00
Gerald Combs
62d87b6cad tools/lemon/lemon.c: Fix an integer shortening issue. (CMake enables
-Werror here but Autotools doesn't. Which is correct?)

epan/dissectors/dcerpc: idl2wrs isn't an installed executable in
Autotools so don't make it one in CMake.

svn path=/trunk/; revision=49871
2013-06-10 18:55:03 +00:00
Gerald Combs
c0702583d3 Make the minimum supported GLib version 2.16.
svn path=/trunk/; revision=49444
2013-05-20 17:27:05 +00:00
Anders Broman
3dc702e2a8 Align a bit more with upstream.
svn path=/trunk/; revision=48559
2013-03-26 05:36:27 +00:00
Anders Broman
f20eeffb18 Align lempar somewhat with upstream.
svn path=/trunk/; revision=48071
2013-03-04 22:04:58 +00:00
Anders Broman
41d6d12497 Rearrang the code to align with sqlite lemon and copy over a few more things.
svn path=/trunk/; revision=48014
2013-03-02 19:34:50 +00:00
Anders Broman
bd2b6b9964 Wite space changes.
svn path=/trunk/; revision=48005
2013-03-02 12:09:50 +00:00
Anders Broman
b9cb9968f2 lemon.c:3176:8: error: attempt to free a non-heap object ‘buf’
svn path=/trunk/; revision=48003
2013-03-02 11:32:25 +00:00
Anders Broman
310b495ff3 Becport more code.
svn path=/trunk/; revision=48002
2013-03-02 10:56:17 +00:00
Anders Broman
ad1ec109ed Missed one place.
svn path=/trunk/; revision=48001
2013-03-02 10:03:43 +00:00
Anders Broman
da070427d9 lemon.c:78:14: note: expected ‘int (*)(const void *, const void *)’ but argument is of type ‘int (*)(const char *, const char *)’
svn path=/trunk/; revision=48000
2013-03-02 09:54:52 +00:00
Anders Broman
99d88bd54b More backports from sqlite lemon to try to address warnings.
svn path=/trunk/; revision=47998
2013-03-02 09:04:52 +00:00
Anders Broman
7c3a122e37 lemon.c:4628:5: error: conflicting types for ‘Configcmp’
lemon.c:366:5: note: previous declaration of ‘Configcmp’ was here

svn path=/trunk/; revision=47997
2013-03-02 08:40:49 +00:00
Anders Broman
18c724b0ad More backports from sqlite lemon to try to address warnings.
svn path=/trunk/; revision=47996
2013-03-02 08:19:31 +00:00
Anders Broman
a5c53e847e Backports from sqlite lemon.
svn path=/trunk/; revision=47993
2013-03-01 23:54:06 +00:00
Jeff Morriss
0b8d70bfb7 Fix a cut-n-pasteo and add a const cast to quiet a warning.
svn path=/trunk/; revision=47991
2013-03-01 22:58:23 +00:00
Anders Broman
ea76d02cb2 Backport const casts from sqlite lemon.
svn path=/trunk/; revision=47989
2013-03-01 21:37:48 +00:00
Anders Broman
44993045a2 try to remove C++ incompatibilities from lemon
svn path=/trunk/; revision=47987
2013-03-01 20:32:20 +00:00
Guy Harris
eb769ce13e Clean up some warnings (including warnings that ultimately come from
trying to modify string constants, which isn't necessarily guaranteed to
work).

svn path=/trunk/; revision=47618
2013-02-10 22:09:21 +00:00
Guy Harris
fbe74322b1 From Bill Parker:
Add some additional memory-allocation failure checks in Lemon.

	Use NULL rather than 0 as the null-pointer constant in those
	checks.

From me:

	Catch one more of the NULL-vs-0 cases.

	Fix some failure messages to use fprintf(stderr, ...) -
	ErrorMsg() requires a file name and line number, and is
	generally used if you're going to continue rather than just give
	up.

svn path=/trunk/; revision=45214
2012-09-29 19:40:27 +00:00
Jeff Morriss
1a97b58332 Followup to r45034: Don't define _U_ on the compile line, pull it in from
config.h (like we do in cmake).  We always HAVE_CONFIG_H so don't check for it.

svn path=/trunk/; revision=45050
2012-09-21 21:29:18 +00:00
Jeff Morriss
abc482e578 Revert r45018 and r45019: put config.h back in lemon.c and take _U_ back off
the compile line when building with cmake.

Put _U_'s definition in config.h when building with autofoo and on Windows.

svn path=/trunk/; revision=45034
2012-09-21 01:42:03 +00:00
Evan Huus
5983528b69 Fix lemon build with cmake by defining _U_. I feel like there's a better
way than all the horrid escaping I had to do, but I don't know what it is.

svn path=/trunk/; revision=45019
2012-09-20 02:55:22 +00:00
Jeff Morriss
4501a9bc84 lemon is not compiled with HAVE_CONFIG_h so don't test for it nor try to include it.
svn path=/trunk/; revision=45018
2012-09-20 02:18:24 +00:00
Chris Maynard
5f6a3400dc Fix Coverity CID 709600: Resource leak.
svn path=/trunk/; revision=43694
2012-07-13 20:04:28 +00:00
Anders Broman
80aba5ebf7 From Martin Kaiser:
CID 280531: "Argument cannot be negative" in lemon
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7453

svn path=/trunk/; revision=43619
2012-07-09 02:24:07 +00:00
Jakub Zawadzki
bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Jörg Mayer
2d7a4646e2 Include config.h in preparation of moving the definition
of _U_ from the compiler command line into config.h

svn path=/trunk/; revision=40806
2012-02-02 11:54:33 +00:00
Anders Broman
0179b7dc50 Add *.sbr files to the clean target.
svn path=/trunk/; revision=40763
2012-01-29 20:33:58 +00:00
Jörg Mayer
1ac8e97ff8 Fix an old style function declaration warning.
svn path=/trunk/; revision=37278
2011-05-19 04:42:57 +00:00
Chris Maynard
c236db55fe Don't use pParser->yyidx as an index into pParser->yystack[] until after it is
verified that it is non-negative.  Should resolve CID 619.

svn path=/trunk/; revision=36431
2011-04-01 16:55:59 +00:00
Ronnie Sahlberg
f4d68c6a08 Memory leak in lemon.c
coverity 1177


svn path=/trunk/; revision=36427
2011-03-31 20:50:13 +00:00
Stig Bjørlykke
feb0a4aeaa Allocate space for null termination in make_basename.
Coverity 710.

svn path=/trunk/; revision=36247
2011-03-22 11:46:19 +00:00
Ronnie Sahlberg
dddec126f6 Coverity 323
Use strdup to copy a string literal we will free() later on.



svn path=/trunk/; revision=36240
2011-03-22 09:12:57 +00:00
Bill Meier
d3efa3ed9f A bit of Windows makefiles rework and cleanup:
- Define macros for certain CFLAGS in config.nmake iso of having defs in each makefile;
  a. -DHAVE_CONFIG_H and -D_U_="" are now part of a macro named STANDARD_CFLAGS;
  b. -WX has been replaced by WARNINGS_ARE_ERRORS (defined as -WX in config.nmake)
      (This allows disabling "Warnings as Errors" by just changing config.nmake)
  c. CVARSDLL definitions (not usage) have been removed from the various makefiles.
     XXX: It appears the usage of CVARSDLL can also be removed (not yet done) since:
     -DWIN32 and -DNULL=0 do not appear to be needed (any more);
     -D_MT and _D_DLL  are not needed since /MP causes these definitions.
  d. Define a macro WARNINGS_CFLAGS with additional specific compiler (level4) warnings to be enabled.
     E.G., 4295: array is too small to include a terminating null character
- config.nmake: reformat some long lines for readability;
- plugins\Makefile.nmake: clean-deps does nothing: remove it (and usage in top-level makefile);
- dissectors/Makefile.nmake: test to enable packet-rrc.obj target needs to include MSVC2010 ...

svn path=/trunk/; revision=35747
2011-02-02 01:19:53 +00:00
Bill Meier
b0aac9d9c2 WIN32 ==> _WIN32
svn path=/trunk/; revision=35745
2011-02-01 23:02:54 +00:00
Guy Harris
347e7a0052 More <stdarg.h> cleanup; some are real bugs, some are just "don't do
va_start and va_end unless you're actually going to use the va_list"
(those bring the va_start and va_end closer to the use point, which
makes it a little more obvious that we're using <stdarg.h> correctly and
makes it a little harder to use it incorrectly).

svn path=/trunk/; revision=32963
2010-05-26 02:25:13 +00:00