rpms/paps/devel paps-0.6.2-fix-bufferoverflow.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 paps.spec, 1.3, 1.4 sources, 1.4, 1.5

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/extras/rpms/paps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17067

Modified Files:
	.cvsignore paps.spec sources 
Added Files:
	paps-0.6.2-fix-bufferoverflow.patch 
Log Message:
* Wed Dec 21 2005 Akira TAGOH <tagoh at redhat.com> - 0.6.2-1
- New upstream release.
  - the bitmap font is now ignored. (#176206)
- paps-0.6.2-fix-bufferoverflow.patch: applied to fix the buffer overflow.

paps-0.6.2-fix-bufferoverflow.patch:

--- NEW FILE paps-0.6.2-fix-bufferoverflow.patch ---
diff -ruN paps-0.6.2.orig/src/libpaps.c paps-0.6.2/src/libpaps.c
--- paps-0.6.2.orig/src/libpaps.c	2005-12-21 05:31:17.000000000 +0900
+++ paps-0.6.2/src/libpaps.c	2005-12-21 18:23:40.000000000 +0900
@@ -147,11 +147,8 @@
                              void *user_data);
 static void get_next_char_id(// output
                              char *char_id);
-static void get_glyph_hash_string(FT_Face face,
-                                  PangoGlyphInfo *glyph_info,
-                                  // output
-                                  gchar *hash_string
-                                  );
+static gchar *get_glyph_hash_string(FT_Face face,
+                                    PangoGlyphInfo *glyph_info);
 
 // Fonts are three character symbols in an alphabet composing of
 // the following characters:
@@ -422,7 +419,7 @@
   double scale = 72.0 / PANGO_SCALE  / PAPS_DPI;
   double epsilon = 1e-2;
   double glyph_width = glyph_info->geometry.width * scale;
-  gchar glyph_hash_string[20];
+  gchar *glyph_hash_string;
   gchar *id;
 
   /* Output outline */
@@ -436,10 +433,8 @@
   FT_Outline_Funcs *outlinefunc;
   OutlineInfo outline_info;
 
-  get_glyph_hash_string(face,
-                        glyph_info,
-                        // output
-                        glyph_hash_string);
+  glyph_hash_string = get_glyph_hash_string(face,
+                                            glyph_info);
 
   // Look up the key in the hash table
   if (!(id = g_hash_table_lookup(paps->glyph_cache,
@@ -498,6 +493,7 @@
       FT_Done_Glyph (glyph);
 
     }
+  g_free(glyph_hash_string);
 
   if (id[0] != '*')
     {
@@ -626,13 +622,10 @@
   return char_id;
 }
 
-static void get_glyph_hash_string(FT_Face face,
-                                  PangoGlyphInfo *glyph_info,
-                                  // output
-                                  gchar *hash_string
-                                  )
+static gchar *get_glyph_hash_string(FT_Face face,
+                                    PangoGlyphInfo *glyph_info)
 {
-  sprintf(hash_string, "%08x-%d-%d",
+  return g_strdup_printf("%08x-%d-%d",
 	  (unsigned int)face,
 	  glyph_info->glyph,
 	  glyph_info->geometry.width


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2005 13:32:23 -0000	1.4
+++ .cvsignore	21 Dec 2005 09:39:00 -0000	1.5
@@ -4,3 +4,4 @@
 paps-0.3.tgz
 paps-0.5.tgz
 paps-0.6.1.tar.gz
+paps-0.6.2.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paps.spec	13 Dec 2005 13:32:24 -0000	1.3
+++ paps.spec	21 Dec 2005 09:39:00 -0000	1.4
@@ -1,13 +1,14 @@
 Name:		paps
-Version:	0.6.1
+Version:	0.6.2
 Release:	1%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
-Source0:	http://paps.sourceforge.net/paps-%{version}.tar.gz
+Source0:	http://prdownloads.sourceforge.net/paps/paps-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
 Patch0:		paps-0.6.1-makefile.patch
+Patch1:		paps-0.6.2-fix-bufferoverflow.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -18,6 +19,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .makefile
+%patch1 -p1 -b .overflow
 aclocal
 automake
 autoconf
@@ -44,6 +46,11 @@
 
 
 %changelog
+* Wed Dec 21 2005 Akira TAGOH <tagoh at redhat.com> - 0.6.2-1
+- New upstream release.
+  - the bitmap font is now ignored. (#176206)
+- paps-0.6.2-fix-bufferoverflow.patch: applied to fix the buffer overflow.
+
 * Tue Dec 13 2005 Akira TAGOH <tagoh at redhat.com> - 0.6.1-1
 - New upstream release.
 - paps-0.6.1-makefile.patch: applied to install docs on the proper dir.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 13:32:24 -0000	1.4
+++ sources	21 Dec 2005 09:39:00 -0000	1.5
@@ -1 +1 @@
-9de11306b1db7c87e754b66e3328b212  paps-0.6.1.tar.gz
+06268e6796e3869275ddeec42d9cfd53  paps-0.6.2.tar.gz