--- rxvt-unicode/src/xpm.C	2006/02/18 15:24:39	1.32
+++ rxvt-unicode/src/xpm.C	2006/08/18 23:03:31	1.35
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:	xpm.C
  *----------------------------------------------------------------------*
  *
@@ -6,6 +6,7 @@
  * Copyright (c) 1997      Carsten Haitzler <raster@zip.com.au>
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
+ * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
  *
  * 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
@@ -57,7 +58,7 @@
   unsigned int w = 0, h = 0;
   unsigned int n;
   char *p;
-  bgPixmap_t *bgpixmap = & (bgPixmap);
+  bgPixmap_t *bgpixmap = &bgPixmap;
 
 #define MAXLEN_GEOM		sizeof("[10000x10000+10000+10000]")
 
@@ -79,7 +80,7 @@
     p = strchr (geom, '\0');
 
   n = (p - geom);
-  if (n <= MAXLEN_GEOM)
+  if (n < MAXLEN_GEOM)
     {
       strncpy (str, geom, n);
       str[n] = '\0';