rpms/stormbaancoureur/devel stormbaancoureur-2.1.5-crash-on-no-network.patch, NONE, 1.1 stormbaancoureur.spec, 1.15, 1.16
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Dec 20 14:36:23 UTC 2009
- Previous message (by thread): rpms/pygobject2/devel .cvsignore, 1.25, 1.26 pygobject2.spec, 1.56, 1.57 sources, 1.25, 1.26
- Next message (by thread): rpms/stormbaancoureur/F-12 stormbaancoureur-2.1.5-crash-on-no-network.patch, NONE, 1.1 stormbaancoureur.spec, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/pkgs/rpms/stormbaancoureur/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15965
Modified Files:
stormbaancoureur.spec
Added Files:
stormbaancoureur-2.1.5-crash-on-no-network.patch
Log Message:
* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-6
- Don't crash on network failures when trying to post scores to the
internet (#547551)
stormbaancoureur-2.1.5-crash-on-no-network.patch:
postscore.cxx | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
--- NEW FILE stormbaancoureur-2.1.5-crash-on-no-network.patch ---
diff -up stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx~ stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx
--- stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx~ 2008-04-20 17:56:48.000000000 +0200
+++ stormbaancoureur-2.1.5/src-stormbaancoureur/postscore.cxx 2009-12-20 15:17:41.000000000 +0100
@@ -33,13 +33,17 @@ static socklen_t addrlen;
void postscore_put(const char *username, float tim)
{
sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (sock<0)
+ if (sock<0) {
perror("socket");
+ return;
+ }
struct hostent *he = gethostbyname(hostname);
- if (!he)
+ if (!he) {
perror("gethostbyname");
- assert(he);
+ return;
+ }
+
struct in_addr ip_addr = *(struct in_addr *)(he->h_addr);
char *ipnr = inet_ntoa(ip_addr);
@@ -52,12 +56,12 @@ void postscore_put(const char *username,
{
perror("inet_aton() failed");
fprintf(stderr,"ipnr = %s\n", ipnr);
+ return;
}
- assert(retval);
addrlen = sizeof(addr);
char m[128];
- sprintf(m, "%-8s %6.2f " VERSION_STRING(GAMEVERSION) , username, tim);
+ snprintf(m, sizeof(m), "%-8s %6.2f " VERSION_STRING(GAMEVERSION) , username, tim);
int rv = sendto(sock, m, strlen(m), 0, (struct sockaddr*) &addr, addrlen);
if (rv<0)
perror("sendto");
Index: stormbaancoureur.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stormbaancoureur/devel/stormbaancoureur.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- stormbaancoureur.spec 3 Aug 2009 08:25:34 -0000 1.15
+++ stormbaancoureur.spec 20 Dec 2009 14:36:23 -0000 1.16
@@ -1,6 +1,6 @@
Name: stormbaancoureur
Version: 2.1.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Simulated obstacle course for automobiles
Group: Amusements/Games
License: GPLv2+
@@ -11,6 +11,7 @@ Source2: sturmbahnfahrer.png
Patch0: stormbaancoureur-1.5.3-no-static-ode.patch
Patch1: stormbaancoureur-2.0.2-snd-debug.patch
Patch2: stormbaancoureur-2.1.5-gcc44.patch
+Patch3: stormbaancoureur-2.1.5-crash-on-no-network.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: plib-devel ode-devel freeglut-devel desktop-file-utils
BuildRequires: alsa-lib-devel
@@ -29,6 +30,7 @@ physics work with you, not against you.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
sed -i 's|/usr/share/games/%{name}|%{_datadir}/%{name}|' src-%{name}/main.cxx
@@ -93,6 +95,10 @@ fi
%changelog
+* Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-6
+- Don't crash on network failures when trying to post scores to the
+ internet (#547551)
+
* Mon Aug 3 2009 Hans de Goede <hdegoede at redhat.com> 2.1.5-5
- Update URL's for upstream domainname change
- Previous message (by thread): rpms/pygobject2/devel .cvsignore, 1.25, 1.26 pygobject2.spec, 1.56, 1.57 sources, 1.25, 1.26
- Next message (by thread): rpms/stormbaancoureur/F-12 stormbaancoureur-2.1.5-crash-on-no-network.patch, NONE, 1.1 stormbaancoureur.spec, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list