diff options
| author | Andreas Brugger <brougs78@gmx.net> | 2006-11-19 19:11:29 +0100 |
|---|---|---|
| committer | Thomas Günther <tom@toms-cafe.de> | 2009-06-03 04:03:18 +0200 |
| commit | 165c14206aa2e06c33ac887f9b9d0f816573a5fe (patch) | |
| tree | b10d11bfb48a418a464d830ca0ef7c24d619ef92 | |
| parent | 74a5cc8e14900d48386e33cb576f154a6dd7e557 (diff) | |
| parent | 5fe5e29f300d653e014f3b656b96f00901f0b106 (diff) | |
| download | vdr-plugin-text2skin-165c14206aa2e06c33ac887f9b9d0f816573a5fe.tar.gz vdr-plugin-text2skin-165c14206aa2e06c33ac887f9b9d0f816573a5fe.tar.bz2 | |
2006-11-19: Version 1.1-cvs_ext-0.9a (vdr-text2skin-1.1-cvs_ext-0.9a.diff)
- added APIVERSION to the Makefile for vdr-1.3.47
- fixed possible buffer overflow in xml reading (updated to cvs-version
of text2skin)
| -rw-r--r-- | HISTORY | 6 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | menu.h | 2 | ||||
| -rw-r--r-- | render.c | 3 | ||||
| -rw-r--r-- | status.c | 2 | ||||
| -rw-r--r-- | status.h | 2 | ||||
| -rw-r--r-- | text2skin.c | 2 | ||||
| -rw-r--r-- | xml/xml.c | 4 |
8 files changed, 20 insertions, 11 deletions
@@ -1,6 +1,12 @@ VDR Plugin 'text2skin' Revision History --------------------------------------- +2006-11-19: Version 1.1-cvs_ext-0.9a (vdr-text2skin-1.1-cvs_ext-0.9a.diff) + +- added APIVERSION to the Makefile for vdr-1.3.47 +- fixed possible buffer overflow in xml reading (updated to cvs-version + of text2skin) + 2006-11-19: Version 1.1-cvs_ext-0.9 (vdr-text2skin-1.1-cvs_ext-0.9.diff) - added a test-feature to search for reruns of a program and add the @@ -43,7 +43,11 @@ TMPDIR = /tmp ### The version number of VDR (taken from VDR's "config.h"): -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') +VDRVERSION = $(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' $(VDRDIR)/config.h) +ifeq ($(APIVERSION),) + APIVERSION = $(VDRVERSION) +endif ### The name of the distribution archive: @@ -126,9 +130,9 @@ all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@ - @cp $@ $(LIBDIR)/$@.$(VDRVERSION) + @cp $@ $(LIBDIR)/$@.$(APIVERSION) ifndef DEBUG - strip $(LIBDIR)/$@.$(VDRVERSION) + strip $(LIBDIR)/$@.$(APIVERSION) endif dist: clean @@ -17,7 +17,7 @@ public: cText2SkinSetupPage(void); virtual ~cText2SkinSetupPage(); - void cText2SkinSetupPage::Setup(void); + void Setup(void); virtual void Store(void); eOSState ProcessKey(eKeys Key); }; @@ -1,5 +1,5 @@ /* - * $Id: render.c,v 1.29 2005/01/27 17:31:12 lordjaxom Exp $ + * $Id: render.c,v 1.30 2006/03/17 18:24:52 lordjaxom Exp $ */ #include "render.h" @@ -221,7 +221,6 @@ void cText2SkinRender::DrawObject(const cxObject *Object) break; case cxObject::list: { - Dprintf("list\n"); const cxObject *item = Object->GetObject(0); if (item && item->Type() == cxObject::item) { txSize areasize = Object->Size(); @@ -1,5 +1,5 @@ /* - * $Id: status.c,v 1.10 2005/06/03 08:53:13 lordjaxom Exp $ + * $Id: status.c,v 1.11 2006/03/17 18:25:57 lordjaxom Exp $ */ #include "status.h" @@ -1,5 +1,5 @@ /* - * $Id: status.h,v 1.7 2005/06/03 08:53:13 lordjaxom Exp $ + * $Id: status.h,v 1.8 2006/03/17 18:25:57 lordjaxom Exp $ */ #ifndef VDR_TEXT2SKIN_STATUS_H diff --git a/text2skin.c b/text2skin.c index 86869e2..2f18e4d 100644 --- a/text2skin.c +++ b/text2skin.c @@ -14,7 +14,7 @@ #include "loader.h" #include "status.h" -const char *cText2SkinPlugin::VERSION = "1.1-cvs_ext-0.9"; +const char *cText2SkinPlugin::VERSION = "1.1-cvs_ext-0.9a"; const char *cText2SkinPlugin::SKINVERSION = "1.0"; const char *cText2SkinPlugin::DESCRIPTION = "Loader for text-based skins"; @@ -1,5 +1,5 @@ /* - * $Id: xml.c,v 1.1 2004/12/19 22:03:49 lordjaxom Exp $ + * $Id: xml.c,v 1.3 2006/09/04 20:51:06 lordjaxom Exp $ * This module was kindly provided by Clemens Kirchgatterer */ @@ -38,7 +38,7 @@ XML::XML(const string &file) { buffer = new char [size+1]; f.read(buffer, size); f.close(); - data = buffer; + data.assign(buffer, size); delete[] buffer; nodestartcb = NULL; nodeendcb = NULL; |